Skip to content

Commit

Permalink
scsi: remove driver_data direct access of struct device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 16, 2009
1 parent f3e7a7b commit 78c55d7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/scsi/aha1740.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ static int aha1740_probe (struct device *dev)

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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/libsrp.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ int srp_target_alloc(struct srp_target *target, struct device *dev,
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;
Expand Down

0 comments on commit 78c55d7

Please sign in to comment.