Staging: hv: make get_channel_info static

This is done by moving it to the only .c file it is used in.

This also allowed us to delete the channel_interface.h file, as it's no
longer needed.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/channel_interface.c b/drivers/staging/hv/channel_interface.c
index c0d1ac8875c10fa0075cfc344b0531ab47eb74a4..24a8951b9a1501ba4f668c0fc5ba746abc111550 100644 (file)
--- a/drivers/staging/hv/channel_interface.c
+++ b/drivers/staging/hv/channel_interface.c
@@ -98,48 +98,6 @@ static int ivmbus_teardown_gpadl(struct hv_device *device,
 
 }
 
-
-void get_channel_info(struct hv_device *device, struct hv_device_info *info)
-{
-       struct vmbus_channel_debug_info debug_info;
-
-       if (!device->context)
-               return;
-
-       vmbus_get_debug_info(device->context, &debug_info);
-
-       info->ChannelId = debug_info.RelId;
-       info->ChannelState = debug_info.State;
-       memcpy(&info->ChannelType, &debug_info.InterfaceType,
-              sizeof(struct hv_guid));
-       memcpy(&info->ChannelInstance, &debug_info.InterfaceInstance,
-              sizeof(struct hv_guid));
-
-       info->MonitorId = debug_info.MonitorId;
-
-       info->ServerMonitorPending = debug_info.ServerMonitorPending;
-       info->ServerMonitorLatency = debug_info.ServerMonitorLatency;
-       info->ServerMonitorConnectionId = debug_info.ServerMonitorConnectionId;
-
-       info->ClientMonitorPending = debug_info.ClientMonitorPending;
-       info->ClientMonitorLatency = debug_info.ClientMonitorLatency;
-       info->ClientMonitorConnectionId = debug_info.ClientMonitorConnectionId;
-
-       info->Inbound.InterruptMask = debug_info.Inbound.CurrentInterruptMask;
-       info->Inbound.ReadIndex = debug_info.Inbound.CurrentReadIndex;
-       info->Inbound.WriteIndex = debug_info.Inbound.CurrentWriteIndex;
-       info->Inbound.BytesAvailToRead = debug_info.Inbound.BytesAvailToRead;
-       info->Inbound.BytesAvailToWrite = debug_info.Inbound.BytesAvailToWrite;
-
-       info->Outbound.InterruptMask = debug_info.Outbound.CurrentInterruptMask;
-       info->Outbound.ReadIndex = debug_info.Outbound.CurrentReadIndex;
-       info->Outbound.WriteIndex = debug_info.Outbound.CurrentWriteIndex;
-       info->Outbound.BytesAvailToRead = debug_info.Outbound.BytesAvailToRead;
-       info->Outbound.BytesAvailToWrite =
-               debug_info.Outbound.BytesAvailToWrite;
-}
-
-
 /* vmbus interface function pointer table */
 const struct vmbus_channel_interface vmbus_ops = {
        .Open = ivmbus_open,

diff --git a/drivers/staging/hv/channel_interface.h b/drivers/staging/hv/channel_interface.h
deleted file mode 100644 (file)
index 82cff3d..0000000
--- a/drivers/staging/hv/channel_interface.h
+++ /dev/null
@@ -1,33 +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>
- *
- */
-
-
-#ifndef _CHANNEL_INTERFACE_H_
-#define _CHANNEL_INTERFACE_H_
-
-#include "vmbus_api.h"
-
-void get_channel_info(struct hv_device *device,
-                   struct hv_device_info *info);
-
-#endif /* _CHANNEL_INTERFACE_H_ */

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 8b3b14e5c37dfe1061a3aed645bc47c98cfeb2bd..1e0a1de8261d4465a179ef3a59374f4aa7f8df76 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -32,7 +32,7 @@
 #include "osd.h"
 #include "logging.h"
 #include "vmbus.h"
-#include "channel_interface.h"
+#include "channel.h"
 
 
 /* FIXME! We need to do this dynamically for PIC and APIC system */
@@ -129,6 +129,47 @@ static struct vmbus_driver_context g_vmbus_drv = {
        .bus.dev_attrs =        vmbus_device_attrs,
 };
 
+static void get_channel_info(struct hv_device *device,
+                            struct hv_device_info *info)
+{
+       struct vmbus_channel_debug_info debug_info;
+
+       if (!device->context)
+               return;
+
+       vmbus_get_debug_info(device->context, &debug_info);
+
+       info->ChannelId = debug_info.RelId;
+       info->ChannelState = debug_info.State;
+       memcpy(&info->ChannelType, &debug_info.InterfaceType,
+              sizeof(struct hv_guid));
+       memcpy(&info->ChannelInstance, &debug_info.InterfaceInstance,
+              sizeof(struct hv_guid));
+
+       info->MonitorId = debug_info.MonitorId;
+
+       info->ServerMonitorPending = debug_info.ServerMonitorPending;
+       info->ServerMonitorLatency = debug_info.ServerMonitorLatency;
+       info->ServerMonitorConnectionId = debug_info.ServerMonitorConnectionId;
+
+       info->ClientMonitorPending = debug_info.ClientMonitorPending;
+       info->ClientMonitorLatency = debug_info.ClientMonitorLatency;
+       info->ClientMonitorConnectionId = debug_info.ClientMonitorConnectionId;
+
+       info->Inbound.InterruptMask = debug_info.Inbound.CurrentInterruptMask;
+       info->Inbound.ReadIndex = debug_info.Inbound.CurrentReadIndex;
+       info->Inbound.WriteIndex = debug_info.Inbound.CurrentWriteIndex;
+       info->Inbound.BytesAvailToRead = debug_info.Inbound.BytesAvailToRead;
+       info->Inbound.BytesAvailToWrite = debug_info.Inbound.BytesAvailToWrite;
+
+       info->Outbound.InterruptMask = debug_info.Outbound.CurrentInterruptMask;
+       info->Outbound.ReadIndex = debug_info.Outbound.CurrentReadIndex;
+       info->Outbound.WriteIndex = debug_info.Outbound.CurrentWriteIndex;
+       info->Outbound.BytesAvailToRead = debug_info.Outbound.BytesAvailToRead;
+       info->Outbound.BytesAvailToWrite =
+               debug_info.Outbound.BytesAvailToWrite;
+}
+
 /*
  * vmbus_show_device_attr - Show the device attribute in sysfs.
  *

diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h
index 588c667a7f6b1350bcad2021c133adf9a20871d3..7bdb29ac89520976001da2bdebf77334ffc7d04a 100644 (file)
--- a/drivers/staging/hv/vmbus_private.h
+++ b/drivers/staging/hv/vmbus_private.h
@@ -29,7 +29,6 @@
 #include "vmbus_api.h"
 #include "channel.h"
 #include "channel_mgmt.h"
-#include "channel_interface.h"
 #include "ring_buffer.h"
 #include <linux/list.h>