From 10bfb505e4d17f9c9cb2e4ffec0bb37a807b396b Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 10 May 2011 07:54:05 -0700
Subject: [PATCH] --- yaml --- r: 249461 b: refs/heads/master c:
 bc2c2dc2e08b605ff13dcfebdabb9f43c11eaf62 h: refs/heads/master i:   249459:
 dd7f611df04b6206e3845233e7df1a2ee0079388 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/hv/blkvsc_drv.c  | 3 ---
 trunk/drivers/staging/hv/storvsc.c     | 7 -------
 trunk/drivers/staging/hv/storvsc_api.h | 1 -
 trunk/drivers/staging/hv/storvsc_drv.c | 1 -
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 655d2304bdb2..feeef9c09829 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e7f0c5579b60a851243796fe7cbe6913aad32b2
+refs/heads/master: bc2c2dc2e08b605ff13dcfebdabb9f43c11eaf62
diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c
index fb23c846b486..d5ab7e5d91c1 100644
--- a/trunk/drivers/staging/hv/blkvsc_drv.c
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index 867eba1b5a78..7074520603ff 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h
index f8c724be22bc..84ee5a9a79ce 100644
--- a/trunk/drivers/staging/hv/storvsc_api.h
+++ b/trunk/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/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
index 799231cb8e20..c54a5fe33f70 100644
--- a/trunk/drivers/staging/hv/storvsc_drv.c
+++ b/trunk/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;