diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 18:27:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-16 18:40:57 -0700 |
| commit | 5152a5098c6b0b2341982987918ae10eb4cc3f9c (patch) | |
| tree | cb93a8556646526380b3114ecfca642cdca0b5d7 /drivers/ipack | |
| parent | fb3fed7926545e44ce36574e1b1c5cdeb018db5c (diff) | |
| download | linux-stable-5152a5098c6b0b2341982987918ae10eb4cc3f9c.tar.gz linux-stable-5152a5098c6b0b2341982987918ae10eb4cc3f9c.tar.bz2 linux-stable-5152a5098c6b0b2341982987918ae10eb4cc3f9c.zip | |
ipack: 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 ipack bus code to use the
correct field.
Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Cc: Jens Taprogge <jens.taprogge@taprogge.org>
Cc: <industrypack-devel@lists.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ipack')
| -rw-r--r-- | drivers/ipack/ipack.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c index 6e066c53acce..d0016ba469ed 100644 --- a/drivers/ipack/ipack.c +++ b/drivers/ipack/ipack.c @@ -180,20 +180,28 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, ipack_device_attr(id_format, "0x%hhu\n"); -static struct device_attribute ipack_dev_attrs[] = { - __ATTR_RO(id), - __ATTR_RO(id_device), - __ATTR_RO(id_format), - __ATTR_RO(id_vendor), - __ATTR_RO(modalias), +static DEVICE_ATTR_RO(id); +static DEVICE_ATTR_RO(id_device); +static DEVICE_ATTR_RO(id_format); +static DEVICE_ATTR_RO(id_vendor); +static DEVICE_ATTR_RO(modalias); + +static struct attribute *ipack_attrs[] = { + &dev_attr_id.attr, + &dev_attr_id_device.attr, + &dev_attr_id_format.attr, + &dev_attr_id_vendor.attr, + &dev_attr_modalias.attr, + NULL, }; +ATTRIBUTE_GROUPS(ipack); static struct bus_type ipack_bus_type = { .name = "ipack", .probe = ipack_bus_probe, .match = ipack_bus_match, .remove = ipack_bus_remove, - .dev_attrs = ipack_dev_attrs, + .dev_groups = ipack_groups, .uevent = ipack_uevent, }; |