From e757046fc84c7c3e8e6ea881a5d736078f750549 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:54:00 -0700 Subject: [PATCH] Staging: hv: Rename the function stor_vsc_on_cleanup 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 | 5 ++--- drivers/staging/hv/storvsc.c | 2 +- drivers/staging/hv/storvsc_api.h | 2 +- drivers/staging/hv/storvsc_drv.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 524c5555bc7c..11868cf7ffd5 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -17,8 +17,7 @@ * Authors: * Haiyang Zhang * Hank Janssen - * - * 4/3/2011: K. Y. Srinivasan - Significant restructuring and cleanup. + * K. Y. Srinivasan */ #include #include @@ -197,7 +196,7 @@ static int blk_vsc_initialize(struct hv_driver *driver) stor_driver->max_outstanding_req_per_channel); /* Setup the dispatch table */ - stor_driver->base.cleanup = stor_vsc_on_cleanup; + stor_driver->base.cleanup = storvsc_cleanup; stor_driver->on_io_request = stor_vsc_on_io_request; return ret; diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 976f3825c4ee..2e276b4d96dd 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -663,7 +663,7 @@ int stor_vsc_get_major_info(struct storvsc_device_info *device_info, /* * stor_vsc_on_cleanup - Perform any cleanup when the driver is removed */ -void stor_vsc_on_cleanup(struct hv_driver *driver) +void storvsc_cleanup(struct hv_driver *driver) { } diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index b3207a00801a..3168161d0a17 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -169,7 +169,7 @@ int storvsc_dev_remove(struct hv_device *device); int stor_vsc_on_io_request(struct hv_device *device, struct hv_storvsc_request *request); -void stor_vsc_on_cleanup(struct hv_driver *driver); +void storvsc_cleanup(struct hv_driver *driver); int stor_vsc_get_major_info(struct storvsc_device_info *device_info, struct storvsc_major_info *major_info); diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 903ecbe795ba..86f2bab0b6c8 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -115,7 +115,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 = storvsc_dev_remove; - stor_driver->base.cleanup = stor_vsc_on_cleanup; + stor_driver->base.cleanup = storvsc_cleanup; stor_driver->on_io_request = stor_vsc_on_io_request; -- 2.34.1