hv: delete vmbus_get_debug_info()

It's only used once, only contains 2 function calls, so just make those
calls directly, deleting the function, and the now unneeded structure
entirely.

Tested-by: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 75c26da3e01127e9e98278be20854593c58cc374..94d54591b2265cca6b6470dbae4ee3184af00192 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -59,16 +59,6 @@ static void vmbus_setevent(struct vmbus_channel *channel)
        }
 }
 
-/*
- * vmbus_get_debug_info -Retrieve various channel debug info
- */
-void vmbus_get_debug_info(struct vmbus_channel *channel,
-                             struct vmbus_channel_debug_info *debuginfo)
-{
-       hv_ringbuffer_get_debuginfo(&channel->inbound, &debuginfo->inbound);
-       hv_ringbuffer_get_debuginfo(&channel->outbound, &debuginfo->outbound);
-}
-
 /*
  * vmbus_open - Open the specified channel.
  */

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 73cb456e256be3908ce15b4c9dbedf20521ca2c1..62d9311b054193571ccb1570b1aa1b156aeb506a 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -63,29 +63,26 @@ static int vmbus_exists(void)
 static void get_channel_info(struct hv_device *device,
                             struct hv_device_info *info)
 {
-       struct vmbus_channel_debug_info debug_info;
+       struct hv_ring_buffer_debug_info inbound;
+       struct hv_ring_buffer_debug_info outbound;
 
        if (!device->channel)
                return;
 
-       vmbus_get_debug_info(device->channel, &debug_info);
-
-       info->inbound.int_mask = debug_info.inbound.current_interrupt_mask;
-       info->inbound.read_idx = debug_info.inbound.current_read_index;
-       info->inbound.write_idx = debug_info.inbound.current_write_index;
-       info->inbound.bytes_avail_toread =
-               debug_info.inbound.bytes_avail_toread;
-       info->inbound.bytes_avail_towrite =
-               debug_info.inbound.bytes_avail_towrite;
-
-       info->outbound.int_mask =
-               debug_info.outbound.current_interrupt_mask;
-       info->outbound.read_idx = debug_info.outbound.current_read_index;
-       info->outbound.write_idx = debug_info.outbound.current_write_index;
-       info->outbound.bytes_avail_toread =
-               debug_info.outbound.bytes_avail_toread;
-       info->outbound.bytes_avail_towrite =
-               debug_info.outbound.bytes_avail_towrite;
+       hv_ringbuffer_get_debuginfo(&device->channel->inbound, &inbound);
+       hv_ringbuffer_get_debuginfo(&device->channel->outbound, &outbound);
+
+       info->inbound.int_mask = inbound.current_interrupt_mask;
+       info->inbound.read_idx = inbound.current_read_index;
+       info->inbound.write_idx = inbound.current_write_index;
+       info->inbound.bytes_avail_toread = inbound.bytes_avail_toread;
+       info->inbound.bytes_avail_towrite = inbound.bytes_avail_towrite;
+
+       info->outbound.int_mask = outbound.current_interrupt_mask;
+       info->outbound.read_idx = outbound.current_read_index;
+       info->outbound.write_idx = outbound.current_write_index;
+       info->outbound.bytes_avail_toread = outbound.bytes_avail_toread;
+       info->outbound.bytes_avail_towrite = outbound.bytes_avail_towrite;
 }
 
 #define VMBUS_ALIAS_LEN ((sizeof((struct hv_vmbus_device_id *)0)->guid) * 2)

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 332e80ce9b8af969d813389da9ad896f122a9cd9..c0e8faf40b354bf61f84239aa5e060bb9e0392f4 100644 (file)
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -899,11 +899,6 @@ enum vmbus_channel_state {
        CHANNEL_OPENED_STATE,
 };
 
-struct vmbus_channel_debug_info {
-       struct hv_ring_buffer_debug_info inbound;
-       struct hv_ring_buffer_debug_info outbound;
-};
-
 /*
  * Represents each channel msg on the vmbus connection This is a
  * variable-size data structure depending on the msg type itself
@@ -1169,9 +1164,6 @@ extern int vmbus_recvpacket_raw(struct vmbus_channel *channel,
                                     u64 *requestid);
 
 
-extern void vmbus_get_debug_info(struct vmbus_channel *channel,
-                                    struct vmbus_channel_debug_info *debug);
-
 extern void vmbus_ontimer(unsigned long data);
 
 struct hv_dev_port_info {