Staging: hv: storvsc: Use the accessor function shost_priv()
authorK. Y. Srinivasan <kys@microsoft.com>
Tue, 8 Nov 2011 17:01:44 +0000 (09:01 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 01:02:07 +0000 (17:02 -0800)
Use the accessor function shost_priv().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc_drv.c

index a1452455e10adc92222bf5b3aaf644876f0edb23..b21e85f8e0d010e712c15b8b53614d91b30fa936 100644 (file)
@@ -968,8 +968,7 @@ static int storvsc_remove(struct hv_device *dev)
 {
        struct storvsc_device *stor_device = hv_get_drvdata(dev);
        struct Scsi_Host *host = stor_device->host;
-       struct hv_host_device *host_dev =
-                       (struct hv_host_device *)host->hostdata;
+       struct hv_host_device *host_dev = shost_priv(host);
 
        scsi_remove_host(host);
 
@@ -1057,8 +1056,7 @@ static int storvsc_host_reset(struct hv_device *device)
  */
 static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
 {
-       struct hv_host_device *host_dev =
-               (struct hv_host_device *)scmnd->device->host->hostdata;
+       struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
        struct hv_device *dev = host_dev->dev;
 
        return storvsc_host_reset(dev);
@@ -1073,8 +1071,7 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
        struct storvsc_cmd_request *cmd_request =
                (struct storvsc_cmd_request *)request->context;
        struct scsi_cmnd *scmnd = cmd_request->cmd;
-       struct hv_host_device *host_dev =
-               (struct hv_host_device *)scmnd->device->host->hostdata;
+       struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
        void (*scsi_done_fn)(struct scsi_cmnd *);
        struct scsi_sense_hdr sense_hdr;
        struct vmscsi_request *vm_srb;
@@ -1144,8 +1141,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
                                void (*done)(struct scsi_cmnd *))
 {
        int ret;
-       struct hv_host_device *host_dev =
-               (struct hv_host_device *)scmnd->device->host->hostdata;
+       struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
        struct hv_device *dev = host_dev->dev;
        struct hv_storvsc_request *request;
        struct storvsc_cmd_request *cmd_request;
@@ -1359,7 +1355,7 @@ static int storvsc_probe(struct hv_device *device,
        if (!host)
                return -ENOMEM;
 
-       host_dev = (struct hv_host_device *)host->hostdata;
+       host_dev = shost_priv(host);
        memset(host_dev, 0, sizeof(struct hv_host_device));
 
        host_dev->port = host->host_no;