leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: remove struct vmbus_channel_interface

Browse Source 
Now that no one uses this structure, remove it, and channel_interface.c
(which is now empty) and the function, vmbus_get_interface() which is
not needed anymore either.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-10-21 10:03:44 -07:00
parent 036a257b0d
commit 8ee48db6be
8 changed files with 1 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/hv/Makefile
View File

@ -6,7 +6,7 @@ obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
hv_vmbus-y := vmbus_drv.o osd.o \
vmbus.o hv.o connection.o channel.o \
channel_mgmt.o channel_interface.o ring_buffer.o
channel_mgmt.o ring_buffer.o
hv_storvsc-y := storvsc_drv.o storvsc.o
hv_blkvsc-y := blkvsc_drv.o blkvsc.o
hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o

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

@ -176,8 +176,6 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx;
int ret;
vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
storvsc_drv_obj->RingBufferSize = blkvsc_ringbuffer_size;
/* Callback to client driver to complete the initialization */

30
drivers/staging/hv/channel_interface.c
View File

@ -1,30 +0,0 @@
/*
*
* Copyright (c) 2009, Microsoft Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place - Suite 330, Boston, MA 02111-1307 USA.
*
* Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com>
*
*/
#include <linux/kernel.h>
#include <linux/mm.h>
#include "osd.h"
#include "vmbus_private.h"
/* vmbus interface function pointer table */
const struct vmbus_channel_interface vmbus_ops = {
};

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

@ -492,8 +492,6 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
struct driver_context *drv_ctx = &g_netvsc_drv.drv_ctx;
int ret;
vmbus_get_interface(&net_drv_obj->Base.VmbusChannelInterface);
net_drv_obj->RingBufferSize = ring_size * PAGE_SIZE;
net_drv_obj->OnReceiveCallback = netvsc_recv_callback;
net_drv_obj->OnLinkStatusChanged = netvsc_linkstatus_callback;

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

@ -141,8 +141,6 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
struct storvsc_driver_object *storvsc_drv_obj = &g_storvsc_drv.drv_obj;
struct driver_context *drv_ctx = &g_storvsc_drv.drv_ctx;
vmbus_get_interface(&storvsc_drv_obj->Base.VmbusChannelInterface);
storvsc_drv_obj->RingBufferSize = storvsc_ringbuffer_size;
/* Callback to client driver to complete the initialization */

2
drivers/staging/hv/vmbus.h
View File

@ -69,10 +69,8 @@ static inline struct driver_context *driver_to_driver_context(struct device_driv
/* Vmbus interface */
int vmbus_child_driver_register(struct driver_context *driver_ctx);
void vmbus_child_driver_unregister(struct driver_context *driver_ctx);
void vmbus_get_interface(struct vmbus_channel_interface *interface);
extern struct completion hv_channel_ready;

16
drivers/staging/hv/vmbus_api.h
View File

@ -84,20 +84,6 @@ struct hv_device_info {
struct hv_dev_port_info Outbound;
};
/**
* struct vmbus_channel_interface - Contains member functions for vmbus channel
*
* This structure contains function pointer to control vmbus channel
* behavior. None of these functions is externally callable, but they
* are used for normal vmbus channel internal behavior.
* Only used by Hyper-V drivers.
*/
struct vmbus_channel_interface {
};
extern const struct vmbus_channel_interface vmbus_ops;
/* Base driver object */
struct hv_driver {
const char *name;
@ -108,8 +94,6 @@ struct hv_driver {
int (*OnDeviceAdd)(struct hv_device *device, void *data);
int (*OnDeviceRemove)(struct hv_device *device);
void (*OnCleanup)(struct hv_driver *driver);
struct vmbus_channel_interface VmbusChannelInterface;
};
/* Base device object */

17
drivers/staging/hv/vmbus_drv.c
View File

@ -485,23 +485,6 @@ void vmbus_child_driver_unregister(struct driver_context *driver_ctx)
}
EXPORT_SYMBOL(vmbus_child_driver_unregister);
/**
* vmbus_get_interface() - Get the vmbus channel interface.
* @interface: Pointer to channel interface structure
*
* Get the Hyper-V channel used for the driver.
*
* @interface is of type &struct vmbus_channel_interface
* This is invoked by child/client driver that sits above vmbus.
*
* Mainly used by Hyper-V drivers.
*/
void vmbus_get_interface(struct vmbus_channel_interface *interface)
{
*interface = vmbus_ops;
}
EXPORT_SYMBOL(vmbus_get_interface);
/*
* vmbus_child_device_create - Creates and registers a new child device
* on the vmbus.