From: K. Y. Srinivasan <kys@microsoft.com>
Date: Tue, 10 May 2011 14:55:52 +0000 (-0700)
Subject: Staging: hv: blkvsc_drv: Move the assignment of driver name
X-Git-Tag: v3.0-rc1~336^2~308
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9528b1d86ac85dcf277fdaa6d8e6d10ad029cfac;p=karo-tx-linux.git

Staging: hv: blkvsc_drv: Move the assignment of driver name

In preperation to eliminating blk_vsc_initialize(), move the assignment
of driver name.

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 182a1914a27f..659c4977f9f3 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -174,7 +174,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
 
 	stor_driver = hvdr_to_stordr(driver);
 
-	driver->name = drv_name;
 	memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid));
 
 	return ret;
@@ -842,6 +841,7 @@ static int blkvsc_drv_init(void)
 	/* Callback to client driver to complete the initialization */
 	blk_vsc_initialize(&storvsc_drv->base);
 
+	drv->name = drv_name;
 	drv->driver.name = drv_name;
 
 	/* The driver belongs to vmbus */