Skip to contentSkip to conversation

scsi: remove driver_data direct access of struct device

PATCH New Greg Kroah-Hartman 1 participant 1 message Apr 30, 2009 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: remove driver_data direct access of struct device

From: Greg Kroah-Hartman <[email protected]>

In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.

---
 drivers/scsi/aha1740.c |    2 +-
 drivers/scsi/libsrp.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/aha1740.c +1 -1
@@ -646,7 +646,7 @@ static int aha1740_probe (struct device 
 
 static __devexit int aha1740_remove (struct device *dev)
 {
-	struct Scsi_Host *shpnt = dev->driver_data;
+	struct Scsi_Host *shpnt = dev_get_drvdata(dev);
 	struct aha1740_hostdata *host = HOSTDATA (shpnt);
 
 	scsi_remove_host(shpnt);
drivers/scsi/libsrp.c +1 -1
@@ -135,7 +135,7 @@ int srp_target_alloc(struct srp_target *
 	INIT_LIST_HEAD(&target->cmd_queue);
 
 	target->dev = dev;
-	target->dev->driver_data = target;
+	dev_set_drvdata(target->dev, target);
 
 	target->srp_iu_size = iu_size;
 	target->rx_ring_size = nr;