---

yaml
---
r: 249478
b: refs/heads/master
c: c2ad483
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97c1529623c794afebe5ef146e35441a507067ad
+refs/heads/master: c2ad4830a742aa926cae0d177d82b1ada7ab16a2

trunk/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;
 }