summaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/storvsc_drv.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2009-07-24 19:58:22 +0200
committerGreg Kroah-Hartman2009-09-15 21:01:45 +0200
commit0883c52bb245cb2be20546babcd54121e7ff17e2 (patch)
tree07f182e35954c3222bac9f145b06e6f59f234ef9 /drivers/staging/hv/storvsc_drv.c
parentStaging: hv: add the Hyper-V virtual scsi driver to the build (diff)
downloadkernel-qcow2-linux-0883c52bb245cb2be20546babcd54121e7ff17e2.tar.gz
kernel-qcow2-linux-0883c52bb245cb2be20546babcd54121e7ff17e2.tar.xz
kernel-qcow2-linux-0883c52bb245cb2be20546babcd54121e7ff17e2.zip
Staging: hv: storvsc: fix up driver_data usage
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>
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
-rw-r--r--drivers/staging/hv/storvsc_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 0a1c14451b0a..1a05134cc40e 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -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);