shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Staging: hv: Get rid of the include of storvsc.c from blkvsc.c

Browse Source 
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>
This commit is contained in:
K. Y. Srinivasan
2011-03-23 10:50:23 -07:00
committed by Greg Kroah-Hartman
parent 78101852f3
commit afa3f3d7f5
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/hv/Makefile
View File

@@ -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

2
drivers/staging/hv/blkvsc.c
View File

@@ -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";

8
drivers/staging/hv/storvsc.c
View File

@@ -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)
{
}

9
drivers/staging/hv/storvsc_api.h
View File

@@ -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_ */