From 2ac5dad14b731fd5dad49e93b38b855a0c413e37 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:53:57 -0700 Subject: [PATCH] Staging: hv: Rename the function stor_vsc_device_add 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 --- drivers/staging/hv/blkvsc_drv.c | 2 +- drivers/staging/hv/storvsc.c | 2 +- drivers/staging/hv/storvsc_api.h | 2 +- drivers/staging/hv/storvsc_drv.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 68cdbaf45142..43391a40f5be 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -147,7 +147,7 @@ static int blkvsc_device_add(struct hv_device *device, device_info = (struct storvsc_device_info *)additional_info; - ret = stor_vsc_on_device_add(device, additional_info); + ret = storvsc_dev_add(device, additional_info); if (ret != 0) return ret; diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 6be504bff2ed..503c6bf12525 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -442,7 +442,7 @@ static int stor_vsc_connect_to_vsp(struct hv_device *device) * stor_vsc_on_device_add - Callback when the device belonging to this driver * is added */ -int stor_vsc_on_device_add(struct hv_device *device, +int storvsc_dev_add(struct hv_device *device, void *additional_info) { struct storvsc_device *stor_device; diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index 4ebf50ae775b..02001545da34 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -163,7 +163,7 @@ struct storvsc_driver *drv_to_stordrv(struct device_driver *d) /* Interface */ -int stor_vsc_on_device_add(struct hv_device *device, +int storvsc_dev_add(struct hv_device *device, void *additional_info); int stor_vsc_on_device_remove(struct hv_device *device); diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 1fce10e4425c..5168eb7f7a67 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -113,7 +113,7 @@ static int stor_vsc_initialize(struct hv_driver *driver) STORVSC_MAX_IO_REQUESTS); /* Setup the dispatch table */ - stor_driver->base.dev_add = stor_vsc_on_device_add; + stor_driver->base.dev_add = storvsc_dev_add; stor_driver->base.dev_rm = stor_vsc_on_device_remove; stor_driver->base.cleanup = stor_vsc_on_cleanup; -- 2.34.1