Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4260e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7048f5d0

drivers/hid/hid-core.c

+6 −4
Original line number Diff line number Diff line
@@ -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,