summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-05-10 07:54:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-11 13:38:59 -0700
commitbc2c2dc2e08b605ff13dcfebdabb9f43c11eaf62 (patch)
treed35822371942bed4fab07e8d89af05dfd5773aca /drivers/staging
parent7e7f0c5579b60a851243796fe7cbe6913aad32b2 (diff)
Staging: hv: blkvsc_drv: Get rid of the calls to storvsc_cleanup
The storvsc_cleanup() is an empty function; get rid of it. 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/hv/blkvsc_drv.c3
-rw-r--r--drivers/staging/hv/storvsc.c7
-rw-r--r--drivers/staging/hv/storvsc_api.h1
-rw-r--r--drivers/staging/hv/storvsc_drv.c1
4 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index fb23c846b486..d5ab7e5d91c1 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -886,7 +886,6 @@ static int blkvsc_drv_exit_cb(struct device *dev, void *data)
static void blkvsc_drv_exit(void)
{
- struct storvsc_driver *storvsc_drv = &blkvsc_drv;
struct hv_driver *drv = &blkvsc_drv.base;
struct device *current_dev;
int ret;
@@ -911,8 +910,6 @@ static void blkvsc_drv_exit(void)
device_unregister(current_dev);
}
- storvsc_cleanup(&storvsc_drv->base);
-
vmbus_child_driver_unregister(&drv->driver);
return;
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 867eba1b5a78..7074520603ff 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -660,10 +660,3 @@ int stor_vsc_get_major_info(struct storvsc_device_info *device_info,
return -ENODEV;
}
-/*
- * stor_vsc_on_cleanup - Perform any cleanup when the driver is removed
- */
-void storvsc_cleanup(struct hv_driver *driver)
-{
-}
-
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index f8c724be22bc..84ee5a9a79ce 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -169,7 +169,6 @@ int storvsc_dev_remove(struct hv_device *device);
int storvsc_do_io(struct hv_device *device,
struct hv_storvsc_request *request);
-void storvsc_cleanup(struct hv_driver *driver);
int stor_vsc_get_major_info(struct storvsc_device_info *device_info,
struct storvsc_major_info *major_info);
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 799231cb8e20..c54a5fe33f70 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -115,7 +115,6 @@ static int stor_vsc_initialize(struct hv_driver *driver)
/* Setup the dispatch table */
stor_driver->base.dev_add = storvsc_dev_add;
stor_driver->base.dev_rm = storvsc_dev_remove;
- stor_driver->base.cleanup = storvsc_cleanup;
stor_driver->on_io_request = storvsc_do_io;