Staging: hv: remove struct vmbus_channel_interface (8ee48db6) · Commits · 戴 / test

drivers/staging/hv/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 */

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		*
		* 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 = {
		};

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 */