summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-05-10 14:55:53 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-11 20:49:21 (GMT)
commitf9bf96a96d6d2c8ae239bc5c133c08bd785eb2f5 (patch)
treea3ecbb9196f994009427d2b797af94cf72379d92 /drivers
parent9528b1d86ac85dcf277fdaa6d8e6d10ad029cfac (diff)
downloadlinux-fsl-qoriq-f9bf96a96d6d2c8ae239bc5c133c08bd785eb2f5.tar.xz
Staging: hv: blkvsc_drv: Inline the copying of dev_type guid
In preperation to eliminating blk_vsc_initialize(), move the copying of dev_type field. 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')
-rw-r--r--drivers/staging/hv/blkvsc_drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 659c497..7914078 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -174,8 +174,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
stor_driver = hvdr_to_stordr(driver);
- memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid));
-
return ret;
}
@@ -841,6 +839,7 @@ static int blkvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
blk_vsc_initialize(&storvsc_drv->base);
+ memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
drv->name = drv_name;
drv->driver.name = drv_name;