diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-28 19:20:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:00 -0400 |
commit | 9f0c7d2cc30a0691d478b069b499d6b1d01546a2 (patch) | |
tree | 7cad8d38238852f320e620c32d6981ed9dec2fb0 /drivers/staging/hv/storvsc_drv.c | |
parent | 9bcd786a311d7601f25a986e106d2bf774a22fdd (diff) |
Staging: hv: fix typedefs in StorVscApi.h
It's all clean now.
Cc: Hank Janssen <hjanssen@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.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index a3d591dac04..155ba1df4b3 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c | |||
@@ -72,7 +72,7 @@ struct storvsc_cmd_request { | |||
72 | struct storvsc_driver_context { | 72 | struct storvsc_driver_context { |
73 | /* !! These must be the first 2 fields !! */ | 73 | /* !! These must be the first 2 fields !! */ |
74 | struct driver_context drv_ctx; | 74 | struct driver_context drv_ctx; |
75 | STORVSC_DRIVER_OBJECT drv_obj; | 75 | struct storvsc_driver_object drv_obj; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | /* Static decl */ | 78 | /* Static decl */ |
@@ -133,7 +133,7 @@ Desc: StorVsc driver initialization. | |||
133 | static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) | 133 | static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) |
134 | { | 134 | { |
135 | int ret=0; | 135 | int ret=0; |
136 | STORVSC_DRIVER_OBJECT *storvsc_drv_obj=&g_storvsc_drv.drv_obj; | 136 | struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj; |
137 | struct driver_context *drv_ctx=&g_storvsc_drv.drv_ctx; | 137 | struct driver_context *drv_ctx=&g_storvsc_drv.drv_ctx; |
138 | 138 | ||
139 | DPRINT_ENTER(STORVSC_DRV); | 139 | DPRINT_ENTER(STORVSC_DRV); |
@@ -186,7 +186,7 @@ Desc: | |||
186 | --*/ | 186 | --*/ |
187 | static void storvsc_drv_exit(void) | 187 | static void storvsc_drv_exit(void) |
188 | { | 188 | { |
189 | STORVSC_DRIVER_OBJECT *storvsc_drv_obj=&g_storvsc_drv.drv_obj; | 189 | struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj; |
190 | struct driver_context *drv_ctx=&g_storvsc_drv.drv_ctx; | 190 | struct driver_context *drv_ctx=&g_storvsc_drv.drv_ctx; |
191 | struct device *current_dev=NULL; | 191 | struct device *current_dev=NULL; |
192 | int ret; | 192 | int ret; |
@@ -236,14 +236,14 @@ static int storvsc_probe(struct device *device) | |||
236 | 236 | ||
237 | struct driver_context *driver_ctx = driver_to_driver_context(device->driver); | 237 | struct driver_context *driver_ctx = driver_to_driver_context(device->driver); |
238 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; | 238 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; |
239 | STORVSC_DRIVER_OBJECT* storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; | 239 | struct storvsc_driver_object *storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; |
240 | 240 | ||
241 | struct device_context *device_ctx = device_to_device_context(device); | 241 | struct device_context *device_ctx = device_to_device_context(device); |
242 | struct hv_device *device_obj = &device_ctx->device_obj; | 242 | struct hv_device *device_obj = &device_ctx->device_obj; |
243 | 243 | ||
244 | struct Scsi_Host *host; | 244 | struct Scsi_Host *host; |
245 | struct host_device_context *host_device_ctx; | 245 | struct host_device_context *host_device_ctx; |
246 | STORVSC_DEVICE_INFO device_info; | 246 | struct storvsc_device_info device_info; |
247 | 247 | ||
248 | DPRINT_ENTER(STORVSC_DRV); | 248 | DPRINT_ENTER(STORVSC_DRV); |
249 | 249 | ||
@@ -339,7 +339,7 @@ static int storvsc_remove(struct device *device) | |||
339 | 339 | ||
340 | struct driver_context *driver_ctx = driver_to_driver_context(device->driver); | 340 | struct driver_context *driver_ctx = driver_to_driver_context(device->driver); |
341 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; | 341 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; |
342 | STORVSC_DRIVER_OBJECT* storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; | 342 | struct storvsc_driver_object *storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; |
343 | 343 | ||
344 | struct device_context *device_ctx = device_to_device_context(device); | 344 | struct device_context *device_ctx = device_to_device_context(device); |
345 | struct hv_device *device_obj = &device_ctx->device_obj; | 345 | struct hv_device *device_obj = &device_ctx->device_obj; |
@@ -665,7 +665,7 @@ static int storvsc_queuecommand(struct scsi_cmnd *scmnd, void (*done)(struct scs | |||
665 | struct device_context *device_ctx=host_device_ctx->device_ctx; | 665 | struct device_context *device_ctx=host_device_ctx->device_ctx; |
666 | struct driver_context *driver_ctx = driver_to_driver_context(device_ctx->device.driver); | 666 | struct driver_context *driver_ctx = driver_to_driver_context(device_ctx->device.driver); |
667 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; | 667 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; |
668 | STORVSC_DRIVER_OBJECT* storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; | 668 | struct storvsc_driver_object *storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; |
669 | 669 | ||
670 | struct hv_storvsc_request *request; | 670 | struct hv_storvsc_request *request; |
671 | struct storvsc_cmd_request *cmd_request; | 671 | struct storvsc_cmd_request *cmd_request; |
@@ -887,7 +887,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) | |||
887 | struct driver_context *driver_ctx = driver_to_driver_context(device_ctx->device.driver); | 887 | struct driver_context *driver_ctx = driver_to_driver_context(device_ctx->device.driver); |
888 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; | 888 | struct storvsc_driver_context *storvsc_drv_ctx = (struct storvsc_driver_context*)driver_ctx; |
889 | 889 | ||
890 | STORVSC_DRIVER_OBJECT *storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; | 890 | struct storvsc_driver_object *storvsc_drv_obj = &storvsc_drv_ctx->drv_obj; |
891 | 891 | ||
892 | DPRINT_ENTER(STORVSC_DRV); | 892 | DPRINT_ENTER(STORVSC_DRV); |
893 | 893 | ||