mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-09 23:00:21 +00:00
HID: convert bus code to use dev_groups
The dev_attrs field of struct bus_type is going away soon, dev_groups should be used instead. This converts the HID bus code to use the correct field. Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7048f5d027
commit
0d4260e04d
@ -1917,11 +1917,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 hid_dev_attrs[] = {
|
static struct attribute *hid_dev_attrs[] = {
|
||||||
__ATTR_RO(modalias),
|
&dev_attr_modalias.attr,
|
||||||
__ATTR_NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
ATTRIBUTE_GROUPS(hid_dev);
|
||||||
|
|
||||||
static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
|
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 = {
|
static struct bus_type hid_bus_type = {
|
||||||
.name = "hid",
|
.name = "hid",
|
||||||
.dev_attrs = hid_dev_attrs,
|
.dev_groups = hid_dev_groups,
|
||||||
.match = hid_bus_match,
|
.match = hid_bus_match,
|
||||||
.probe = hid_device_probe,
|
.probe = hid_device_probe,
|
||||||
.remove = hid_device_remove,
|
.remove = hid_device_remove,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user