summaryrefslogtreecommitdiffstats
path: root/drivers/hv
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-13 20:32:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 18:01:17 +0200
commit2c9be3eacc39948af2341595322c014833699ac5 (patch)
tree3d63dd025005f923ec4daa9ec9052494ee41ed7e /drivers/hv
parenthv: move "client/server_monitor_conn_id" bus attributes to dev_groups (diff)
downloadlinux-2c9be3eacc39948af2341595322c014833699ac5.tar.xz
linux-2c9be3eacc39948af2341595322c014833699ac5.zip
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>
Diffstat (limited to 'drivers/hv')
-rw-r--r--drivers/hv/channel.c10
-rw-r--r--drivers/hv/vmbus_drv.c35
2 files changed, 16 insertions, 29 deletions
diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 75c26da3e011..94d54591b226 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -60,16 +60,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.
*/
int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 73cb456e256b..62d9311b0541 100644
--- 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)