Staging: hv: storvsc_drv: Rename variables pointing to struct hv_device

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index c1832202c9b43518359cb46726e43f462de805d3..c654172313e51309f5df46efc314f0c1af252668 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -368,7 +368,6 @@ static int storvsc_probe(struct hv_device *device)
                return -1;
        }
 
-       /* host_device_ctx->port = device_info.PortNumber; */
        host_dev->path = device_info.path_id;
        host_dev->target = device_info.target_id;
 
@@ -685,9 +684,9 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
        int ret;
        struct hv_host_device *host_dev =
                (struct hv_host_device *)scmnd->device->host->hostdata;
-       struct hv_device *device_ctx = host_dev->dev;
+       struct hv_device *dev = host_dev->dev;
        struct storvsc_driver *storvsc_drv_obj =
-               drv_to_stordrv(device_ctx->device.driver);
+               drv_to_stordrv(dev->device.driver);
        struct hv_storvsc_request *request;
        struct storvsc_cmd_request *cmd_request;
        unsigned int request_size = 0;
@@ -831,7 +830,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
 
 retry_request:
        /* Invokes the vsc to start an IO */
-       ret = storvsc_drv_obj->on_io_request(device_ctx,
+       ret = storvsc_drv_obj->on_io_request(dev,
                                           &cmd_request->request);
        if (ret == -1) {
                /* no more space */
@@ -918,18 +917,18 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
        int ret;
        struct hv_host_device *host_dev =
                (struct hv_host_device *)scmnd->device->host->hostdata;
-       struct hv_device *device_ctx = host_dev->dev;
+       struct hv_device *dev = host_dev->dev;
 
        DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...",
-                   scmnd->device, device_ctx);
+                   scmnd->device, dev);
 
        /* Invokes the vsc to reset the host/bus */
-       ret = stor_vsc_on_host_reset(device_ctx);
+       ret = stor_vsc_on_host_reset(dev);
        if (ret != 0)
                return ret;
 
        DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host reseted",
-                   scmnd->device, device_ctx);
+                   scmnd->device, dev);
 
        return ret;
 }