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 /virtio-convert-bus-code-to-use-dev_groups.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'virtio-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | virtio-convert-bus-code-to-use-dev_groups.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/virtio-convert-bus-code-to-use-dev_groups.patch b/virtio-convert-bus-code-to-use-dev_groups.patch deleted file mode 100644 index 1e68f1ae1f8b97..00000000000000 --- a/virtio-convert-bus-code-to-use-dev_groups.patch +++ /dev/null @@ -1,88 +0,0 @@ -From foo@baz Mon Oct 7 18:11:58 PDT 2013 -Date: Mon, 07 Oct 2013 18:11:58 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: virtio: convert bus code to use dev_groups - -The dev_attrs field of struct bus_type is going away soon, dev_groups -should be used instead. This converts the virtio bus code to use the -correct field. - -Cc: Rusty Russell <rusty@rustcorp.com.au> -Cc: "Michael S. Tsirkin" <mst@redhat.com> -Cc: <virtualization@lists.linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/virtio/virtio.c | 27 +++++++++++++++++++-------- - 1 file changed, 19 insertions(+), 8 deletions(-) - ---- a/drivers/virtio/virtio.c -+++ b/drivers/virtio/virtio.c -@@ -13,18 +13,24 @@ static ssize_t device_show(struct device - struct virtio_device *dev = dev_to_virtio(_d); - return sprintf(buf, "0x%04x\n", dev->id.device); - } -+static DEVICE_ATTR_RO(device); -+ - static ssize_t vendor_show(struct device *_d, - struct device_attribute *attr, char *buf) - { - struct virtio_device *dev = dev_to_virtio(_d); - return sprintf(buf, "0x%04x\n", dev->id.vendor); - } -+static DEVICE_ATTR_RO(vendor); -+ - static ssize_t status_show(struct device *_d, - struct device_attribute *attr, char *buf) - { - struct virtio_device *dev = dev_to_virtio(_d); - return sprintf(buf, "0x%08x\n", dev->config->get_status(dev)); - } -+static DEVICE_ATTR_RO(status); -+ - static ssize_t modalias_show(struct device *_d, - struct device_attribute *attr, char *buf) - { -@@ -32,6 +38,8 @@ static ssize_t modalias_show(struct devi - return sprintf(buf, "virtio:d%08Xv%08X\n", - dev->id.device, dev->id.vendor); - } -+static DEVICE_ATTR_RO(modalias); -+ - static ssize_t features_show(struct device *_d, - struct device_attribute *attr, char *buf) - { -@@ -47,14 +55,17 @@ static ssize_t features_show(struct devi - len += sprintf(buf+len, "\n"); - return len; - } --static struct device_attribute virtio_dev_attrs[] = { -- __ATTR_RO(device), -- __ATTR_RO(vendor), -- __ATTR_RO(status), -- __ATTR_RO(modalias), -- __ATTR_RO(features), -- __ATTR_NULL -+static DEVICE_ATTR_RO(features); -+ -+static struct attribute *virtio_dev_attrs[] = { -+ &dev_attr_device.attr, -+ &dev_attr_vendor.attr, -+ &dev_attr_status.attr, -+ &dev_attr_modalias.attr, -+ &dev_attr_features.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(virtio_dev); - - static inline int virtio_id_match(const struct virtio_device *dev, - const struct virtio_device_id *id) -@@ -165,7 +176,7 @@ static int virtio_dev_remove(struct devi - static struct bus_type virtio_bus = { - .name = "virtio", - .match = virtio_dev_match, -- .dev_attrs = virtio_dev_attrs, -+ .dev_groups = virtio_dev_groups, - .uevent = virtio_uevent, - .probe = virtio_dev_probe, - .remove = virtio_dev_remove, |