Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fdde16d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

hv: delete struct hv_dev_port_info 



It's no longer needed, and the struct hv_ring_buffer_debug_info
structure shouldn't be "global" so move it to the local .h file instead.

Tested-by: default avatar"K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c9be3ea

drivers/hv/hyperv_vmbus.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -514,6 +514,13 @@ struct hv_context { 




extern struct hv_context hv_context;

extern struct hv_context hv_context;





struct hv_ring_buffer_debug_info {

	u32 current_interrupt_mask;

	u32 current_read_index;

	u32 current_write_index;

	u32 bytes_avail_toread;

	u32 bytes_avail_towrite;

};





/* Hv Interface */

/* Hv Interface */

drivers/hv/vmbus_drv.c

+10 −25
Original line number Original line Diff line number Diff line
@@ -47,8 +47,8 @@ static struct completion probe_event; 
static int irq;

static int irq;





struct hv_device_info {

struct hv_device_info {

	struct hv_dev_port_info inbound;

	struct hv_ring_buffer_debug_info inbound;

	struct hv_dev_port_info outbound;

	struct hv_ring_buffer_debug_info outbound;

};

};





static int vmbus_exists(void)

static int vmbus_exists(void)
@@ -63,26 +63,11 @@ static int vmbus_exists(void) 
static void get_channel_info(struct hv_device *device,

static void get_channel_info(struct hv_device *device,

			     struct hv_device_info *info)

			     struct hv_device_info *info)

{

{

	struct hv_ring_buffer_debug_info inbound;

	struct hv_ring_buffer_debug_info outbound;



	if (!device->channel)

	if (!device->channel)

		return;

		return;





	hv_ringbuffer_get_debuginfo(&device->channel->inbound, &inbound);

	hv_ringbuffer_get_debuginfo(&device->channel->inbound, &info->inbound);

	hv_ringbuffer_get_debuginfo(&device->channel->outbound, &outbound);

	hv_ringbuffer_get_debuginfo(&device->channel->outbound, &info->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)

#define VMBUS_ALIAS_LEN ((sizeof((struct hv_vmbus_device_id *)0)->guid) * 2)
@@ -114,11 +99,11 @@ static ssize_t vmbus_show_device_attr(struct device *dev, 
	get_channel_info(hv_dev, device_info);

	get_channel_info(hv_dev, device_info);





	if (!strcmp(dev_attr->attr.name, "out_intr_mask")) {

	if (!strcmp(dev_attr->attr.name, "out_intr_mask")) {

		ret = sprintf(buf, "%d\n", device_info->outbound.int_mask);

		ret = sprintf(buf, "%d\n", device_info->outbound.current_interrupt_mask);

	} else if (!strcmp(dev_attr->attr.name, "out_read_index")) {

	} else if (!strcmp(dev_attr->attr.name, "out_read_index")) {

		ret = sprintf(buf, "%d\n", device_info->outbound.read_idx);

		ret = sprintf(buf, "%d\n", device_info->outbound.current_read_index);

	} else if (!strcmp(dev_attr->attr.name, "out_write_index")) {

	} else if (!strcmp(dev_attr->attr.name, "out_write_index")) {

		ret = sprintf(buf, "%d\n", device_info->outbound.write_idx);

		ret = sprintf(buf, "%d\n", device_info->outbound.current_write_index);

	} else if (!strcmp(dev_attr->attr.name, "out_read_bytes_avail")) {

	} else if (!strcmp(dev_attr->attr.name, "out_read_bytes_avail")) {

		ret = sprintf(buf, "%d\n",

		ret = sprintf(buf, "%d\n",

			       device_info->outbound.bytes_avail_toread);

			       device_info->outbound.bytes_avail_toread);
@@ -126,11 +111,11 @@ static ssize_t vmbus_show_device_attr(struct device *dev, 
		ret = sprintf(buf, "%d\n",

		ret = sprintf(buf, "%d\n",

			       device_info->outbound.bytes_avail_towrite);

			       device_info->outbound.bytes_avail_towrite);

	} else if (!strcmp(dev_attr->attr.name, "in_intr_mask")) {

	} else if (!strcmp(dev_attr->attr.name, "in_intr_mask")) {

		ret = sprintf(buf, "%d\n", device_info->inbound.int_mask);

		ret = sprintf(buf, "%d\n", device_info->inbound.current_interrupt_mask);

	} else if (!strcmp(dev_attr->attr.name, "in_read_index")) {

	} else if (!strcmp(dev_attr->attr.name, "in_read_index")) {

		ret = sprintf(buf, "%d\n", device_info->inbound.read_idx);

		ret = sprintf(buf, "%d\n", device_info->inbound.current_read_index);

	} else if (!strcmp(dev_attr->attr.name, "in_write_index")) {

	} else if (!strcmp(dev_attr->attr.name, "in_write_index")) {

		ret = sprintf(buf, "%d\n", device_info->inbound.write_idx);

		ret = sprintf(buf, "%d\n", device_info->inbound.current_write_index);

	} else if (!strcmp(dev_attr->attr.name, "in_read_bytes_avail")) {

	} else if (!strcmp(dev_attr->attr.name, "in_read_bytes_avail")) {

		ret = sprintf(buf, "%d\n",

		ret = sprintf(buf, "%d\n",

			       device_info->inbound.bytes_avail_toread);

			       device_info->inbound.bytes_avail_toread);

include/linux/hyperv.h

+0 −17
Original line number Original line Diff line number Diff line
@@ -429,15 +429,6 @@ struct hv_ring_buffer_info { 
	u32 ring_data_startoffset;

	u32 ring_data_startoffset;

};

};





struct hv_ring_buffer_debug_info {

	u32 current_interrupt_mask;

	u32 current_read_index;

	u32 current_write_index;

	u32 bytes_avail_toread;

	u32 bytes_avail_towrite;

};





/*

/*

 *

 *

 * hv_get_ringbuffer_availbytes()

 * hv_get_ringbuffer_availbytes()
@@ -1166,14 +1157,6 @@ extern int vmbus_recvpacket_raw(struct vmbus_channel *channel, 




extern void vmbus_ontimer(unsigned long data);

extern void vmbus_ontimer(unsigned long data);





struct hv_dev_port_info {

	u32 int_mask;

	u32 read_idx;

	u32 write_idx;

	u32 bytes_avail_toread;

	u32 bytes_avail_towrite;

};



/* Base driver object */

/* Base driver object */

struct hv_driver {

struct hv_driver {

	const char *name;

	const char *name;