Skip to content

Commit

Permalink
uwb: convert bus code to use dev_groups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Oct 17, 2013
1 parent f24fc57 commit 1b60403
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/uwb/umc-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,22 @@ 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)
{
struct umc_dev *umc = to_umc_dev(dev);

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",
Expand All @@ -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);

Expand Down

0 comments on commit 1b60403

Please sign in to comment.