[PATCH 12/16] Staging: hv: Cleanup initialization of blkvsc driver
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: 2011-03-23 17:40:50
Also in:
lkml
Subsystem:
staging subsystem, the rest · Maintainers:
Greg Kroah-Hartman, Linus Torvalds
Cleanup the initialization sequence for the block driver. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <redacted> --- drivers/staging/hv/blkvsc_drv.c | 8 ++++---- drivers/staging/hv/storvsc_api.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 1d602a1..824080d 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c@@ -155,7 +155,7 @@ static int blk_vsc_on_device_add(struct hv_device *device, } -int blk_vsc_initialize(struct hv_driver *driver) +static int blk_vsc_initialize(struct hv_driver *driver) { struct storvsc_driver_object *stor_driver; int ret = 0;
@@ -243,7 +243,7 @@ static const struct block_device_operations block_ops = { /* * blkvsc_drv_init - BlkVsc driver initialization. */ -static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) +static int blkvsc_drv_init(void) { struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv; struct hv_driver *drv = &g_blkvsc_drv.base;
@@ -254,7 +254,7 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) drv->priv = storvsc_drv_obj; /* Callback to client driver to complete the initialization */ - drv_init(&storvsc_drv_obj->base); + blk_vsc_initialize(&storvsc_drv_obj->base); drv->driver.name = storvsc_drv_obj->base.name;
@@ -1552,7 +1552,7 @@ static int __init blkvsc_init(void) DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing...."); - ret = blkvsc_drv_init(blk_vsc_initialize); + ret = blkvsc_drv_init(); return ret; }
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 9a452f2..d985bbf 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h@@ -139,7 +139,6 @@ struct storvsc_device { /* Interface */ int stor_vsc_on_host_reset(struct hv_device *device); -int blk_vsc_initialize(struct hv_driver *driver); int stor_vsc_on_device_add(struct hv_device *device, void *additional_info);
--
1.7.4.1