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

Commit 5ffd00e2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

hv: move "monitor_id" bus attribute to dev_groups 



This moves the "state" bus attribute to the dev_groups structure,
removing the need for it to be in a temporary structure.

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 a8fb5f3d

drivers/hv/channel.c

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ void vmbus_get_debug_info(struct vmbus_channel *channel, 


	monitorpage = (struct hv_monitor_page *)vmbus_connection.monitor_pages;



	debuginfo->monitorid = channel->offermsg.monitorid;



	debuginfo->servermonitor_pending =

			monitorpage->trigger_group[monitor_group].pending;

	debuginfo->servermonitor_latency =

drivers/hv/vmbus_drv.c

+12 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct hv_device_info { 
	uuid_le chn_type;

	uuid_le chn_instance;



	u32 monitor_id;

	u32 server_monitor_pending;

	u32 server_monitor_latency;

	u32 server_monitor_conn_id;
@@ -86,8 +85,6 @@ static void get_channel_info(struct hv_device *device, 
	memcpy(&info->chn_instance, &debug_info.interface_instance,

	       sizeof(uuid_le));



	info->monitor_id = debug_info.monitorid;



	info->server_monitor_pending = debug_info.servermonitor_pending;

	info->server_monitor_latency = debug_info.servermonitor_latency;

	info->server_monitor_conn_id = debug_info.servermonitor_connectionid;
@@ -174,8 +171,6 @@ static ssize_t vmbus_show_device_attr(struct device *dev, 
	} else if (!strcmp(dev_attr->attr.name, "in_write_bytes_avail")) {

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

			       device_info->inbound.bytes_avail_towrite);

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

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

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

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

	} else if (!strcmp(dev_attr->attr.name, "server_monitor_latency")) {
@@ -218,9 +213,21 @@ static ssize_t state_show(struct device *dev, struct device_attribute *dev_attr, 
}

static DEVICE_ATTR_RO(state);



static ssize_t monitor_id_show(struct device *dev,

			       struct device_attribute *dev_attr, char *buf)

{

	struct hv_device *hv_dev = device_to_hv_device(dev);



	if (!hv_dev->channel)

		return -ENODEV;

	return sprintf(buf, "%d\n", hv_dev->channel->offermsg.monitorid);

}

static DEVICE_ATTR_RO(monitor_id);



static struct attribute *vmbus_attrs[] = {

	&dev_attr_id.attr,

	&dev_attr_state.attr,

	&dev_attr_monitor_id.attr,

	NULL,

};

ATTRIBUTE_GROUPS(vmbus);
@@ -229,7 +236,6 @@ ATTRIBUTE_GROUPS(vmbus); 
static struct device_attribute vmbus_device_attrs[] = {

	__ATTR(class_id, S_IRUGO, vmbus_show_device_attr, NULL),

	__ATTR(device_id, S_IRUGO, vmbus_show_device_attr, NULL),

	__ATTR(monitor_id, S_IRUGO, vmbus_show_device_attr, NULL),

	__ATTR(modalias, S_IRUGO, vmbus_show_device_attr, NULL),



	__ATTR(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL),

include/linux/hyperv.h

+0 −1
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ enum vmbus_channel_state { 
struct vmbus_channel_debug_info {

	uuid_le interfacetype;

	uuid_le interface_instance;

	u32 monitorid;

	u32 servermonitor_pending;

	u32 servermonitor_latency;

	u32 servermonitor_connectionid;