From f9bf96a96d6d2c8ae239bc5c133c08bd785eb2f5 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:55:53 -0700 Subject: 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 Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/blkvsc_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/staging/hv/blkvsc_drv.c') diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 659c4977f9f..7914078b42f 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; -- cgit v1.2.3