Staging: hv: Rename the function stor_vsc_on_device_remove

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>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 43391a40f5be7807b9188bc8816860e69cd29cbb..fe86599442ec01f7fa136d080b49035b30294ec5 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/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/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 503c6bf125250caf7fc2f10351f85c9041e8bf17..976f3825c4ee1dc610d76229ab2f502efb3c55eb 100644 (file)
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -483,7 +483,7 @@ cleanup:
 /*
  * 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/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 02001545da34fb0f6e8151aeb9575e9331d6ffae..b3207a00801ad3155b5d520661b3a96cc45ab7fd 100644 (file)
--- a/drivers/staging/hv/storvsc_api.h
+++ b/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/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 5168eb7f7a67a4b11f64fe14d458f3b7ef42cde2..903ecbe795bad2b475de25b998e9a2bb84f6ec31 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/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;