|
@@ -1917,11 +1917,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
|
|
|
|
|
|
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
|
|
|
}
|
|
|
+static DEVICE_ATTR_RO(modalias);
|
|
|
|
|
|
-static struct device_attribute hid_dev_attrs[] = {
|
|
|
- __ATTR_RO(modalias),
|
|
|
- __ATTR_NULL,
|
|
|
+static struct attribute *hid_dev_attrs[] = {
|
|
|
+ &dev_attr_modalias.attr,
|
|
|
+ NULL,
|
|
|
};
|
|
|
+ATTRIBUTE_GROUPS(hid_dev);
|
|
|
|
|
|
static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
{
|
|
@@ -1949,7 +1951,7 @@ static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
|
|
|
static struct bus_type hid_bus_type = {
|
|
|
.name = "hid",
|
|
|
- .dev_attrs = hid_dev_attrs,
|
|
|
+ .dev_groups = hid_dev_groups,
|
|
|
.match = hid_bus_match,
|
|
|
.probe = hid_device_probe,
|
|
|
.remove = hid_device_remove,
|