2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 11d2602ae88e..869a11bdccbd 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1877,7 +1877,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         unsigned long wait_switch = 0;
         int rc;
 
-        vdev->dev.driver_data = NULL;
+        dev_set_drvdata(&vdev->dev, NULL);
 
         host = scsi_host_alloc(&driver_template, sizeof(*hostdata));
         if (!host) {
@@ -1949,7 +1949,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
                         scsi_scan_host(host);
         }
 
-        vdev->dev.driver_data = hostdata;
+        dev_set_drvdata(&vdev->dev, hostdata);
         return 0;
 
       add_srp_port_failed:
@@ -1968,7 +1968,7 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 
 static int ibmvscsi_remove(struct vio_dev *vdev)
 {
-        struct ibmvscsi_host_data *hostdata = vdev->dev.driver_data;
+        struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);
         unmap_persist_bufs(hostdata);
         release_event_pool(&hostdata->pool, hostdata);
         ibmvscsi_ops->release_crq_queue(&hostdata->queue, hostdata,
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index e2dd6a45924a..d5eaf9727109 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -892,7 +892,7 @@ free_vport:
 
 static int ibmvstgt_remove(struct vio_dev *dev)
 {
-        struct srp_target *target = (struct srp_target *) dev->dev.driver_data;
+        struct srp_target *target = dev_get_drvdata(&dev->dev);
         struct Scsi_Host *shost = target->shost;
         struct vio_port *vport = target->ldata;