| --- |
| 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) |
