From e0f7e1536376303e2891398c0167828ad09ea25f Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 10 May 2011 07:53:59 -0700
Subject: [PATCH] --- yaml --- r: 249455 b: refs/heads/master c:
 3530ef301049ed795645824146a66e22e04f4616 h: refs/heads/master i:   249453:
 e192e35c4ca4456df10257b49751befa8ed8ff0e   249451:
 5c16ba8673e10439288fa5a7e3c3ad1933e2ead8   249447:
 d4becd05cc3d9637264489c7d6d6f8d903cd82a1   249439:
 0c4b065a51d16774cd3de7eae58e2069ed772632 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/hv/blkvsc_drv.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 55c732902653..97d752f4b7a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb706b0458228bb56002f478e0ec46932df840c2
+refs/heads/master: 3530ef301049ed795645824146a66e22e04f4616
diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c
index fe86599442ec..524c5555bc7c 100644
--- a/trunk/drivers/staging/hv/blkvsc_drv.c
+++ b/trunk/drivers/staging/hv/blkvsc_drv.c
@@ -197,7 +197,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
 		    stor_driver->max_outstanding_req_per_channel);
 
 	/* Setup the dispatch table */
-	stor_driver->base.dev_rm = storvsc_dev_remove;
 	stor_driver->base.cleanup = stor_vsc_on_cleanup;
 	stor_driver->on_io_request = stor_vsc_on_io_request;
 
@@ -543,8 +542,6 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev)
  */
 static int blkvsc_remove(struct hv_device *dev)
 {
-	struct storvsc_driver *storvsc_drv =
-				drv_to_stordrv(dev->device.driver);
 	struct block_device_context *blkdev = dev_get_drvdata(&dev->device);
 	unsigned long flags;
 
@@ -552,7 +549,7 @@ static int blkvsc_remove(struct hv_device *dev)
 	 * Call to the vsc driver to let it know that the device is being
 	 * removed
 	 */
-	storvsc_drv->base.dev_rm(dev);
+	storvsc_dev_remove(dev);
 
 	/* Get to a known state */
 	spin_lock_irqsave(&blkdev->lock, flags);
@@ -934,9 +931,6 @@ static void blkvsc_drv_exit(void)
  */
 static int blkvsc_probe(struct hv_device *dev)
 {
-	struct storvsc_driver *storvsc_drv =
-			drv_to_stordrv(dev->device.driver);
-
 	struct block_device_context *blkdev = NULL;
 	struct storvsc_device_info device_info;
 	struct storvsc_major_info major_info;
@@ -1033,7 +1027,7 @@ static int blkvsc_probe(struct hv_device *dev)
 	return ret;
 
 remove:
-	storvsc_drv->base.dev_rm(dev);
+	storvsc_dev_remove(dev);
 
 cleanup:
 	if (blkdev) {