From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:54:02 +0000 (-0700) Subject: Staging: hv: Rename the function stor_vsc_on_io_request X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bb46592617cd409572daaa7d5a90437b38197692;p=deliverable%2Flinux.git Staging: hv: Rename the function stor_vsc_on_io_request 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 e028db2cc024..8564718aa91f 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -196,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->on_io_request = stor_vsc_on_io_request; + stor_driver->on_io_request = storvsc_do_io; return ret; } diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 2e276b4d96dd..867eba1b5a78 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -520,7 +520,7 @@ int storvsc_dev_remove(struct hv_device *device) /* * stor_vsc_on_io_request - Callback to initiate an I/O request */ -int stor_vsc_on_io_request(struct hv_device *device, +int storvsc_do_io(struct hv_device *device, struct hv_storvsc_request *request) { struct storvsc_device *stor_device; diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index 3168161d0a17..f8c724be22bc 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -167,7 +167,7 @@ int storvsc_dev_add(struct hv_device *device, void *additional_info); int storvsc_dev_remove(struct hv_device *device); -int stor_vsc_on_io_request(struct hv_device *device, +int storvsc_do_io(struct hv_device *device, struct hv_storvsc_request *request); void storvsc_cleanup(struct hv_driver *driver); diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 86f2bab0b6c8..799231cb8e20 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -117,7 +117,7 @@ static int stor_vsc_initialize(struct hv_driver *driver) stor_driver->base.dev_rm = storvsc_dev_remove; stor_driver->base.cleanup = storvsc_cleanup; - stor_driver->on_io_request = stor_vsc_on_io_request; + stor_driver->on_io_request = storvsc_do_io; return 0; }