diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/ssb | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/main.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 32a811d..e55ddf7 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -374,8 +374,7 @@ static ssize_t \ attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \ { \ return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \ -} \ -static DEVICE_ATTR_RO(attrib); +} ssb_config_attr(core_num, core_index, "%u\n") ssb_config_attr(coreid, id.coreid, "0x%04x\n") @@ -388,18 +387,16 @@ name_show(struct device *dev, struct device_attribute *attr, char *buf) return sprintf(buf, "%s\n", ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); } -static DEVICE_ATTR_RO(name); - -static struct attribute *ssb_device_attrs[] = { - &dev_attr_name.attr, - &dev_attr_core_num.attr, - &dev_attr_coreid.attr, - &dev_attr_vendor.attr, - &dev_attr_revision.attr, - &dev_attr_irq.attr, - NULL, + +static struct device_attribute ssb_device_attrs[] = { + __ATTR_RO(name), + __ATTR_RO(core_num), + __ATTR_RO(coreid), + __ATTR_RO(vendor), + __ATTR_RO(revision), + __ATTR_RO(irq), + __ATTR_NULL, }; -ATTRIBUTE_GROUPS(ssb_device); static struct bus_type ssb_bustype = { .name = "ssb", @@ -410,7 +407,7 @@ static struct bus_type ssb_bustype = { .suspend = ssb_device_suspend, .resume = ssb_device_resume, .uevent = ssb_device_uevent, - .dev_groups = ssb_device_groups, + .dev_attrs = ssb_device_attrs, }; static void ssb_buses_lock(void) |