1 From foo@baz Fri Jul 24 10:58:22 PDT 2009
2 Date: Fri, 24 Jul 2009 10:58:22 -0700
3 From: Greg Kroah-Hartman <gregkh@suse.de>
4 Subject: Staging: hv: storvsc: fix up driver_data usage
6 From: Greg Kroah-Hartman <gregkh@suse.de>
8 driver_data is gone now from struct device, so use the proper functions
11 Thanks to Bill Pemberton for pointing out this build error.
13 Cc: Bill Pemberton <wfp5p@viridian.itc.Virginia.EDU>
14 Cc: Hank Janssen <hjanssen@microsoft.com>
15 Cc: Haiyang Zhang <haiyangz@microsoft.com>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
19 drivers/staging/hv/storvsc_drv.c | 8 ++++----
20 1 file changed, 4 insertions(+), 4 deletions(-)
22 --- a/drivers/staging/hv/storvsc_drv.c
23 +++ b/drivers/staging/hv/storvsc_drv.c
24 @@ -279,7 +279,7 @@ static int storvsc_probe(struct device *
28 - device->driver_data = host;
29 + dev_set_drvdata(device, host);
31 host_device_ctx = (struct host_device_context*)host->hostdata;
32 memset(host_device_ctx, 0, sizeof(struct host_device_context));
33 @@ -380,7 +380,7 @@ static int storvsc_remove(struct device
34 struct device_context *device_ctx = device_to_device_context(device);
35 DEVICE_OBJECT* device_obj = &device_ctx->device_obj;
37 - struct Scsi_Host *host = (struct Scsi_Host *)device->driver_data;
38 + struct Scsi_Host *host = dev_get_drvdata(device);
39 struct host_device_context *host_device_ctx=(struct host_device_context*)host->hostdata;
42 @@ -1125,7 +1125,7 @@ static void storvsc_host_rescan_callback
43 DEVICE_OBJECT* device_obj = (DEVICE_OBJECT*)context;
45 struct device_context* device_ctx = to_device_context(device_obj);
46 - struct Scsi_Host *host = (struct Scsi_Host *)device_ctx->device.driver_data;
47 + struct Scsi_Host *host = dev_get_drvdata(&device_ctx->device);
48 struct scsi_device *sdev;
49 struct host_device_context *host_device_ctx;
50 struct scsi_device **sdevs_remove_list;
51 @@ -1293,7 +1293,7 @@ static int storvsc_report_luns(struct sc
52 static void storvsc_host_rescan(DEVICE_OBJECT* device_obj)
54 struct device_context* device_ctx = to_device_context(device_obj);
55 - struct Scsi_Host *host = (struct Scsi_Host *)device_ctx->device.driver_data;
56 + struct Scsi_Host *host = dev_get_drvdata(&device_ctx->device);
57 struct host_device_context *host_device_ctx;
59 DPRINT_ENTER(STORVSC_DRV);