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

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

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

Cc: Bruno Morelli <bruno@evidence.eu.com>
Cc: <linux-usb@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f24fc57b

drivers/uwb/umc-bus.c

+8 −5
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ static ssize_t capability_id_show(struct device *dev, struct device_attribute *a 


	return sprintf(buf, "0x%02x\n", umc->cap_id);

}

static DEVICE_ATTR_RO(capability_id);



static ssize_t version_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -208,12 +209,14 @@ static ssize_t version_show(struct device *dev, struct device_attribute *attr, c 


	return sprintf(buf, "0x%04x\n", umc->version);

}

static DEVICE_ATTR_RO(version);



static struct device_attribute umc_dev_attrs[] = {

	__ATTR_RO(capability_id),

	__ATTR_RO(version),

	__ATTR_NULL,

static struct attribute *umc_dev_attrs[] = {

	&dev_attr_capability_id.attr,

	&dev_attr_version.attr,

	NULL,

};

ATTRIBUTE_GROUPS(umc_dev);



struct bus_type umc_bus_type = {

	.name		= "umc",
@@ -222,7 +225,7 @@ struct bus_type umc_bus_type = { 
	.remove		= umc_device_remove,

	.suspend        = umc_device_suspend,

	.resume         = umc_device_resume,

	.dev_attrs	= umc_dev_attrs,

	.dev_groups	= umc_dev_groups,

};

EXPORT_SYMBOL_GPL(umc_bus_type);