From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:56:06 +0000 (-0700) Subject: Staging: hv: storvsc_drv: Inline the copying of the dev_type information X-Git-Tag: firefly_0821_release~7613^2~1326^2~294 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1a96d9a4f3545444ea310d643279408c2d794a1c;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 94471304ad6a..3be4f1a65fee 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;