|
@@ -471,11 +471,13 @@ static ssize_t modalias_show(struct device *_dev, struct device_attribute *a,
|
|
|
|
|
|
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
|
|
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_dev);
|
|
|
|
|
|
struct bus_type ps3_system_bus_type = {
|
|
struct bus_type ps3_system_bus_type = {
|
|
.name = "ps3_system_bus",
|
|
.name = "ps3_system_bus",
|
|
@@ -484,7 +486,7 @@ struct bus_type ps3_system_bus_type = {
|
|
.probe = ps3_system_bus_probe,
|
|
.probe = ps3_system_bus_probe,
|
|
.remove = ps3_system_bus_remove,
|
|
.remove = ps3_system_bus_remove,
|
|
.shutdown = ps3_system_bus_shutdown,
|
|
.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)
|
|
static int __init ps3_system_bus_init(void)
|