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>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 659c4977f9f33b75f20726d8f73219aa58d72099..7914078b42fef96f6a6c2f9d1f7fdad0d0d4029e 100644 (file)
--- 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;