diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-23 10:50:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-04 21:50:42 -0700 |
| commit | afa3f3d7f57bc9adb3f7cc2c853153916f690eda (patch) | |
| tree | b7fc4ea84571a530b02706d46b29ff96ac4af938 | |
| parent | 78101852f3d08134e89979b491a9fa815395c9f5 (diff) | |
| download | linux-3.10-afa3f3d7f57bc9adb3f7cc2c853153916f690eda.tar.gz linux-3.10-afa3f3d7f57bc9adb3f7cc2c853153916f690eda.tar.bz2 linux-3.10-afa3f3d7f57bc9adb3f7cc2c853153916f690eda.zip | |
Staging: hv: Get rid of the include of storvsc.c from blkvsc.c
Now that all the structure definitions have been moved to a header file,
get rid of the inclusion of storvsc.c from blkvsc.c.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/blkvsc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc.c | 8 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc_api.h | 9 |
4 files changed, 15 insertions, 6 deletions
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index abeb2f7ef4e..a733154fa7e 100644 --- a/drivers/staging/hv/Makefile +++ b/drivers/staging/hv/Makefile @@ -9,6 +9,6 @@ hv_vmbus-y := vmbus_drv.o \ hv.o connection.o channel.o \ channel_mgmt.o ring_buffer.o hv_storvsc-y := storvsc_drv.o storvsc.o -hv_blkvsc-y := blkvsc_drv.o blkvsc.o +hv_blkvsc-y := blkvsc_drv.o blkvsc.o storvsc.o hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o hv_utils-y := hv_util.o hv_kvp.o diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c index 88d6e3c14df..ebe511a59e4 100644 --- a/drivers/staging/hv/blkvsc.c +++ b/drivers/staging/hv/blkvsc.c @@ -22,8 +22,8 @@ */ #include <linux/kernel.h> #include <linux/mm.h> +#include "logging.h" #include "hv_api.h" -#include "storvsc.c" #include "storvsc_api.h" static const char *g_blk_driver_name = "blkvsc"; diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index be1c77a1d23..c8d7ff7fc28 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -504,7 +504,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 */ -static int stor_vsc_on_device_add(struct hv_device *device, +int stor_vsc_on_device_add(struct hv_device *device, void *additional_info) { struct storvsc_device *stor_device; @@ -553,7 +553,7 @@ cleanup: /* * stor_vsc_on_device_remove - Callback when the our device is being removed */ -static int stor_vsc_on_device_remove(struct hv_device *device) +int stor_vsc_on_device_remove(struct hv_device *device) { struct storvsc_device *stor_device; @@ -646,7 +646,7 @@ cleanup: /* * stor_vsc_on_io_request - Callback to initiate an I/O request */ -static int stor_vsc_on_io_request(struct hv_device *device, +int stor_vsc_on_io_request(struct hv_device *device, struct hv_storvsc_request *request) { struct storvsc_device *stor_device; @@ -739,7 +739,7 @@ static int stor_vsc_on_io_request(struct hv_device *device, /* * stor_vsc_on_cleanup - Perform any cleanup when the driver is removed */ -static void stor_vsc_on_cleanup(struct hv_driver *driver) +void stor_vsc_on_cleanup(struct hv_driver *driver) { } diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index 7f780c58223..141b8fd33be 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -142,4 +142,13 @@ int stor_vsc_initialize(struct hv_driver *driver); int stor_vsc_on_host_reset(struct hv_device *device); int blk_vsc_initialize(struct hv_driver *driver); +int stor_vsc_on_device_add(struct hv_device *device, + void *additional_info); +int stor_vsc_on_device_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); + + #endif /* _STORVSC_API_H_ */ |