From 8ee48db6be4d6634d3ade242470381040d4b8e21 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 10:03:44 -0700 Subject: [PATCH] Staging: hv: remove struct vmbus_channel_interface 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 Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/Makefile | 2 +- drivers/staging/hv/blkvsc_drv.c | 2 -- drivers/staging/hv/channel_interface.c | 30 -------------------------- drivers/staging/hv/netvsc_drv.c | 2 -- drivers/staging/hv/storvsc_drv.c | 2 -- drivers/staging/hv/vmbus.h | 2 -- drivers/staging/hv/vmbus_api.h | 16 -------------- drivers/staging/hv/vmbus_drv.c | 17 --------------- 8 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 drivers/staging/hv/channel_interface.c diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index cd1c43a3588..b46349bb43b 100644 --- a/drivers/staging/hv/Makefile +++ b/drivers/staging/hv/Makefile @@ -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 diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index ff1d24720f1..039f0e5b216 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -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 */ diff --git a/drivers/staging/hv/channel_interface.c b/drivers/staging/hv/channel_interface.c deleted file mode 100644 index 8f75963b49b..00000000000 --- a/drivers/staging/hv/channel_interface.c +++ /dev/null @@ -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 - * Hank Janssen - * - */ -#include -#include -#include "osd.h" -#include "vmbus_private.h" - -/* vmbus interface function pointer table */ -const struct vmbus_channel_interface vmbus_ops = { -}; diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 45e082a8f6b..d5d4d5de2f3 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -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; diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 075b61bd492..b267799ac04 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -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 */ diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h index 3c14b2926e0..42f2adb9954 100644 --- a/drivers/staging/hv/vmbus.h +++ b/drivers/staging/hv/vmbus.h @@ -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; diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h index 79a906f3e48..2af42e55007 100644 --- a/drivers/staging/hv/vmbus_api.h +++ b/drivers/staging/hv/vmbus_api.h @@ -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 */ diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 92ba95c7c6d..0d9f3a411e7 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -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. -- 2.39.3