diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
| commit | 6e287ace225948565fdcbe3c5cc75d3843af79d0 (patch) | |
| tree | c8da80c9a0686704f6abacaf5677087bff5e8370 /p27.patch | |
| parent | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (diff) | |
| download | patches-6e287ace225948565fdcbe3c5cc75d3843af79d0.tar.gz | |
cleaned up the bus_type.dev_attrs patch series
Diffstat (limited to 'p27.patch')
| -rw-r--r-- | p27.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/p27.patch b/p27.patch deleted file mode 100644 index 2d9ee69d48ec5a..00000000000000 --- a/p27.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- - arch/powerpc/platforms/ps3/system-bus.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - ---- a/arch/powerpc/platforms/ps3/system-bus.c -+++ b/arch/powerpc/platforms/ps3/system-bus.c -@@ -471,11 +471,13 @@ static ssize_t modalias_show(struct devi - - return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; - } -+static DEVICE_ATTR_RO(modalias); - --static struct device_attribute ps3_system_bus_dev_attrs[] = { -- __ATTR_RO(modalias), -- __ATTR_NULL, -+static struct attribute *ps3_system_bus_dev_attrs[] = { -+ &dev_attr_modalias.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(ps3_system_bus); - - struct bus_type ps3_system_bus_type = { - .name = "ps3_system_bus", -@@ -484,7 +486,7 @@ struct bus_type ps3_system_bus_type = { - .probe = ps3_system_bus_probe, - .remove = ps3_system_bus_remove, - .shutdown = ps3_system_bus_shutdown, -- .dev_attrs = ps3_system_bus_dev_attrs, -+ .dev_groups = ps3_system_bus_dev_groups, - }; - - static int __init ps3_system_bus_init(void) |