Commit 78c55d76b84628862079351f77aa0f4aa3b65f58

Authored by Greg Kroah-Hartman
1 parent f3e7a7b64a

scsi: remove driver_data direct access of struct device

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.

Cc: linux-scsi@vger.kernel.org
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/scsi/aha1740.c
... ... @@ -646,7 +646,7 @@
646 646  
647 647 static __devexit int aha1740_remove (struct device *dev)
648 648 {
649   - struct Scsi_Host *shpnt = dev->driver_data;
  649 + struct Scsi_Host *shpnt = dev_get_drvdata(dev);
650 650 struct aha1740_hostdata *host = HOSTDATA (shpnt);
651 651  
652 652 scsi_remove_host(shpnt);
drivers/scsi/libsrp.c
... ... @@ -135,7 +135,7 @@
135 135 INIT_LIST_HEAD(&target->cmd_queue);
136 136  
137 137 target->dev = dev;
138   - target->dev->driver_data = target;
  138 + dev_set_drvdata(target->dev, target);
139 139  
140 140 target->srp_iu_size = iu_size;
141 141 target->rx_ring_size = nr;