diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
| commit | 7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3 (patch) | |
| tree | 5761a78996b2f07f160c7a1e91b3a0f387272c4c /hv-move-state-bus-attribute-to-dev_groups.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'hv-move-state-bus-attribute-to-dev_groups.patch')
| -rw-r--r-- | hv-move-state-bus-attribute-to-dev_groups.patch | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/hv-move-state-bus-attribute-to-dev_groups.patch b/hv-move-state-bus-attribute-to-dev_groups.patch deleted file mode 100644 index 7bcefbe85129ed..00000000000000 --- a/hv-move-state-bus-attribute-to-dev_groups.patch +++ /dev/null @@ -1,93 +0,0 @@ -From foo@baz Mon Sep 9 14:31:19 PDT 2013 -Date: Mon, 09 Sep 2013 14:31:19 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: hv: move "state" 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. - -Cc: "K. Y. Srinivasan" <kys@microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/hv/channel.c | 1 - - drivers/hv/vmbus_drv.c | 17 ++++++++++++----- - include/linux/hyperv.h | 1 - - 3 files changed, 12 insertions(+), 7 deletions(-) - ---- a/drivers/hv/channel.c -+++ b/drivers/hv/channel.c -@@ -69,7 +69,6 @@ void vmbus_get_debug_info(struct vmbus_c - u8 monitor_group = (u8)channel->offermsg.monitorid / 32; - u8 monitor_offset = (u8)channel->offermsg.monitorid % 32; - -- debuginfo->state = channel->state; - memcpy(&debuginfo->interfacetype, - &channel->offermsg.offer.if_type, sizeof(uuid_le)); - memcpy(&debuginfo->interface_instance, ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -47,7 +47,6 @@ static struct completion probe_event; - static int irq; - - struct hv_device_info { -- u32 chn_state; - uuid_le chn_type; - uuid_le chn_instance; - -@@ -82,7 +81,6 @@ static void get_channel_info(struct hv_d - - vmbus_get_debug_info(device->channel, &debug_info); - -- info->chn_state = debug_info.state; - memcpy(&info->chn_type, &debug_info.interfacetype, - sizeof(uuid_le)); - memcpy(&info->chn_instance, &debug_info.interface_instance, -@@ -152,8 +150,6 @@ static ssize_t vmbus_show_device_attr(st - } else if (!strcmp(dev_attr->attr.name, "modalias")) { - print_alias_name(hv_dev, alias_name); - ret = sprintf(buf, "vmbus:%s\n", alias_name); -- } else if (!strcmp(dev_attr->attr.name, "state")) { -- ret = sprintf(buf, "%d\n", device_info->chn_state); - } else if (!strcmp(dev_attr->attr.name, "out_intr_mask")) { - ret = sprintf(buf, "%d\n", device_info->outbound.int_mask); - } else if (!strcmp(dev_attr->attr.name, "out_read_index")) { -@@ -211,15 +207,26 @@ static ssize_t id_show(struct device *de - } - static DEVICE_ATTR_RO(id); - -+static ssize_t state_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->state); -+} -+static DEVICE_ATTR_RO(state); -+ - static struct attribute *vmbus_attrs[] = { - &dev_attr_id.attr, -+ &dev_attr_state.attr, - NULL, - }; - ATTRIBUTE_GROUPS(vmbus); - - /* Set up per device attributes in /sys/bus/vmbus/devices/<bus device> */ - static struct device_attribute vmbus_device_attrs[] = { -- __ATTR(state, S_IRUGO, vmbus_show_device_attr, NULL), - __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), ---- a/include/linux/hyperv.h -+++ b/include/linux/hyperv.h -@@ -903,7 +903,6 @@ enum vmbus_channel_state { - }; - - struct vmbus_channel_debug_info { -- enum vmbus_channel_state state; - uuid_le interfacetype; - uuid_le interface_instance; - u32 monitorid; |