---

yaml --- r: 249454 b: refs/heads/master c: cb706b0 h: refs/heads/master v: v3
git-mirror · May 11, 2011 · 3b9108a · 3b9108a
1 parent e192e35
commit 3b9108a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ac5dad14b731fd5dad49e93b38b855a0c413e37
+refs/heads/master: cb706b0458228bb56002f478e0ec46932df840c2
diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c
@@ -197,7 +197,7 @@ 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 = stor_vsc_on_device_remove;
+	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;
 

diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
@@ -483,7 +483,7 @@ int storvsc_dev_add(struct hv_device *device,
 /*
  * stor_vsc_on_device_remove - Callback when the our device is being removed
  */
-int stor_vsc_on_device_remove(struct hv_device *device)
+int storvsc_dev_remove(struct hv_device *device)
 {
 	struct storvsc_device *stor_device;
 

diff --git a/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h
@@ -165,7 +165,7 @@ struct storvsc_driver *drv_to_stordrv(struct device_driver *d)
 
 int storvsc_dev_add(struct hv_device *device,
 				void *additional_info);
-int stor_vsc_on_device_remove(struct hv_device *device);
+int storvsc_dev_remove(struct hv_device *device);
 
 int stor_vsc_on_io_request(struct hv_device *device,
 				struct hv_storvsc_request *request);

diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
@@ -114,7 +114,7 @@ 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	= stor_vsc_on_device_remove;
+	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;