Staging: hv: storvsc: fix up driver_data usage
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 24 Jul 2009 17:58:22 +0000 (10:58 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:01:45 +0000 (12:01 -0700)
driver_data is gone now from struct device, so use the proper functions
to access it instead.

Thanks to Bill Pemberton for pointing out this build error.

Cc: Bill Pemberton <wfp5p@viridian.itc.Virginia.EDU>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc_drv.c

index 0a1c144..1a05134 100644 (file)
@@ -279,7 +279,7 @@ static int storvsc_probe(struct device *device)
                return -ENOMEM;
        }
 
-       device->driver_data = host;
+       dev_set_drvdata(device, host);
 
        host_device_ctx = (struct host_device_context*)host->hostdata;
        memset(host_device_ctx, 0, sizeof(struct host_device_context));
@@ -380,7 +380,7 @@ static int storvsc_remove(struct device *device)
        struct device_context *device_ctx = device_to_device_context(device);
        DEVICE_OBJECT* device_obj = &device_ctx->device_obj;
 
-       struct Scsi_Host *host = (struct Scsi_Host *)device->driver_data;
+       struct Scsi_Host *host = dev_get_drvdata(device);
        struct host_device_context *host_device_ctx=(struct host_device_context*)host->hostdata;
 
 
@@ -1125,7 +1125,7 @@ static void storvsc_host_rescan_callback(void* context)
        DEVICE_OBJECT* device_obj = (DEVICE_OBJECT*)context;
 #endif
        struct device_context* device_ctx = to_device_context(device_obj);
-       struct Scsi_Host *host = (struct Scsi_Host *)device_ctx->device.driver_data;
+       struct Scsi_Host *host = dev_get_drvdata(&device_ctx->device);
        struct scsi_device *sdev;
        struct host_device_context *host_device_ctx;
        struct scsi_device **sdevs_remove_list;
@@ -1293,7 +1293,7 @@ static int storvsc_report_luns(struct scsi_device *sdev, unsigned int luns[], un
 static void storvsc_host_rescan(DEVICE_OBJECT* device_obj)
 {
        struct device_context* device_ctx = to_device_context(device_obj);
-       struct Scsi_Host *host = (struct Scsi_Host *)device_ctx->device.driver_data;
+       struct Scsi_Host *host = dev_get_drvdata(&device_ctx->device);
        struct host_device_context *host_device_ctx;
 
        DPRINT_ENTER(STORVSC_DRV);