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

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

hsi: 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 hsi code to use the
correct field.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85dd9268

drivers/hsi/hsi.c

+6 −4
Original line number Diff line number Diff line
@@ -33,11 +33,13 @@ static ssize_t modalias_show(struct device *dev, 
{

	return sprintf(buf, "hsi:%s\n", dev_name(dev));

}

static DEVICE_ATTR_RO(modalias);



static struct device_attribute hsi_bus_dev_attrs[] = {

	__ATTR_RO(modalias),

	__ATTR_NULL,

static struct attribute *hsi_bus_dev_attrs[] = {

	&dev_attr_modalias.attr,

	NULL,

};

ATTRIBUTE_GROUPS(hsi_bus_dev);



static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)

{
@@ -53,7 +55,7 @@ static int hsi_bus_match(struct device *dev, struct device_driver *driver) 


static struct bus_type hsi_bus_type = {

	.name		= "hsi",

	.dev_attrs	= hsi_bus_dev_attrs,

	.dev_groups	= hsi_bus_dev_groups,

	.match		= hsi_bus_match,

	.uevent		= hsi_bus_uevent,

};