diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
| commit | 9e06a307a040bb17573afb2f48b6a7d26920394f (patch) | |
| tree | 222b8cbd15a432f906f01dcd21de484984a01bc4 /p19.patch | |
| parent | 439aaed86577bc756086c2193f8fa23ae48d6722 (diff) | |
| download | patches-9e06a307a040bb17573afb2f48b6a7d26920394f.tar.gz | |
new dev_attr bus removal patches added
Diffstat (limited to 'p19.patch')
| -rw-r--r-- | p19.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/p19.patch b/p19.patch new file mode 100644 index 00000000000000..94bbb029dfd228 --- /dev/null +++ b/p19.patch @@ -0,0 +1,52 @@ +--- + arch/mips/sgi-ip22/ip22-gio.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +--- a/arch/mips/sgi-ip22/ip22-gio.c ++++ b/arch/mips/sgi-ip22/ip22-gio.c +@@ -182,6 +182,7 @@ static ssize_t modalias_show(struct devi + + return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; + } ++static DEVICE_ATTR_RO(modalias); + + static ssize_t name_show(struct device *dev, + struct device_attribute *attr, char *buf) +@@ -191,6 +192,7 @@ static ssize_t name_show(struct device * + giodev = to_gio_device(dev); + return sprintf(buf, "%s", giodev->name); + } ++static DEVICE_ATTR_RO(name); + + static ssize_t id_show(struct device *dev, + struct device_attribute *attr, char *buf) +@@ -200,13 +202,15 @@ static ssize_t id_show(struct device *de + giodev = to_gio_device(dev); + return sprintf(buf, "%x", giodev->id.id); + } ++static DEVICE_ATTR_RO(id); + +-static struct device_attribute gio_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_RO(name), +- __ATTR_RO(id), +- __ATTR_NULL, ++static struct attribute *gio_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ &dev_attr_name.attr, ++ &dev_attr_id.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(gio_dev); + + static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -377,7 +381,7 @@ static void ip22_check_gio(int slotno, u + + static struct bus_type gio_bus_type = { + .name = "gio", +- .dev_attrs = gio_dev_attrs, ++ .dev_groups = gio_dev_groups, + .match = gio_bus_match, + .probe = gio_device_probe, + .remove = gio_device_remove, |