Staging: hv: Cleanup the initialization of storvsc driver
authorK. Y. Srinivasan <kys@microsoft.com>
Wed, 23 Mar 2011 17:50:27 +0000 (10:50 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 Apr 2011 04:50:44 +0000 (21:50 -0700)
Cleanup the initialization sequence for the storvsc driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/storvsc_drv.c

index af6a37d4bc631042d2239bd1cf657965af1c9e0a..2c51a0728cc196856a16dfe45bee257377b5247f 100644 (file)
@@ -191,7 +191,7 @@ static struct scsi_host_template scsi_driver = {
 /*
  * storvsc_drv_init - StorVsc driver initialization.
  */
-static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
+static int storvsc_drv_init(void)
 {
        int ret;
        struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv;
@@ -200,7 +200,7 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
        storvsc_drv_obj->ring_buffer_size = storvsc_ringbuffer_size;
 
        /* Callback to client driver to complete the initialization */
-       drv_init(&storvsc_drv_obj->base);
+       stor_vsc_initialize(&storvsc_drv_obj->base);
 
        drv->priv = storvsc_drv_obj;
 
@@ -986,7 +986,7 @@ static int __init storvsc_init(void)
        int ret;
 
        DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
-       ret = storvsc_drv_init(stor_vsc_initialize);
+       ret = storvsc_drv_init();
        return ret;
 }