diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-05-10 07:56:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 13:49:27 -0700 |
| commit | 1a96d9a4f3545444ea310d643279408c2d794a1c (patch) | |
| tree | 3092d0a85749c81614bc6d24ae14670a982a772c /drivers/staging/hv/storvsc_drv.c | |
| parent | 4742e82fa4ac22960c3edbfc06454ca664de9a56 (diff) | |
| download | op-kernel-dev-1a96d9a4f3545444ea310d643279408c2d794a1c.zip op-kernel-dev-1a96d9a4f3545444ea310d643279408c2d794a1c.tar.gz | |
Staging: hv: storvsc_drv: Inline the copying of the dev_type information
In preperation to eliminate the function storvsc_initialize()
move the copying of dev_type info.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: 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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 9447130..3be4f1a 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -83,12 +83,6 @@ static int storvsc_initialize(struct hv_driver *driver) stor_driver = hvdr_to_stordr(driver); - - /* Make sure we are at least 2 pages since 1 page is used for control */ - - memcpy(&driver->dev_type, &gStorVscDeviceType, - sizeof(struct hv_guid)); - return 0; } @@ -801,6 +795,9 @@ static int storvsc_drv_init(void) /* Callback to client driver to complete the initialization */ storvsc_initialize(&storvsc_drv_obj->base); + memcpy(&drv->dev_type, &gStorVscDeviceType, + sizeof(struct hv_guid)); + if (max_outstanding_req_per_channel < STORVSC_MAX_IO_REQUESTS) return -1; |
