2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index ed0e3e55652a..538135783aab 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -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);
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 15e2d132e8b9..2742ae8a3d09 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -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;