From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:53:58 +0000 (-0700) Subject: Staging: hv: Rename the function stor_vsc_on_device_remove X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cb706b0458228bb56002f478e0ec46932df840c2;p=deliverable%2Flinux.git Staging: hv: Rename the function stor_vsc_on_device_remove Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 43391a40f5be..fe86599442ec 100644 --- 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 503c6bf12525..976f3825c4ee 100644 --- 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 02001545da34..b3207a00801a 100644 --- 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 5168eb7f7a67..903ecbe795ba 100644 --- 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;