evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uwb: convert bus code to use dev_groups

Browse source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-10-06 23:55:44 -07:00
parent f24fc57b24
commit 1b604039a3
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/uwb/umc-bus.c
View file

@ -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); 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) 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); return sprintf(buf, "0x%04x\n", umc->version);
} }
static DEVICE_ATTR_RO(version);
static struct device_attribute umc_dev_attrs[] = { static struct attribute *umc_dev_attrs[] = {
__ATTR_RO(capability_id), &dev_attr_capability_id.attr,
__ATTR_RO(version), &dev_attr_version.attr,
__ATTR_NULL, NULL,
}; };
ATTRIBUTE_GROUPS(umc_dev);
struct bus_type umc_bus_type = { struct bus_type umc_bus_type = {
.name = "umc", .name = "umc",
@ -222,7 +225,7 @@ struct bus_type umc_bus_type = {
.remove = umc_device_remove, .remove = umc_device_remove,
.suspend = umc_device_suspend, .suspend = umc_device_suspend,
.resume = umc_device_resume, .resume = umc_device_resume,
.dev_attrs = umc_dev_attrs, .dev_groups = umc_dev_groups,
}; };
EXPORT_SYMBOL_GPL(umc_bus_type); EXPORT_SYMBOL_GPL(umc_bus_type);