Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78c55d76 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f3e7a7b6

drivers/scsi/aha1740.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/libsrp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;