Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[~andy/linux] / drivers / pwm / sysfs.c

diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
index 8c20332d4825810a366e3af07b1d8831617d1951..4bd0c639e16da9d49598f637c5473ae37e419def 100644 (file)
--- a/drivers/pwm/sysfs.c
+++ b/drivers/pwm/sysfs.c
@@ -169,15 +169,7 @@ static struct attribute *pwm_attrs[] = {
        &dev_attr_polarity.attr,
        NULL
 };
-
-static const struct attribute_group pwm_attr_group = {
-       .attrs          = pwm_attrs,
-};
-
-static const struct attribute_group *pwm_attr_groups[] = {
-       &pwm_attr_group,
-       NULL,
-};
+ATTRIBUTE_GROUPS(pwm);
 
 static void pwm_export_release(struct device *child)
 {
@@ -205,7 +197,7 @@ static int pwm_export_child(struct device *parent, struct pwm_device *pwm)
        export->child.release = pwm_export_release;
        export->child.parent = parent;
        export->child.devt = MKDEV(0, 0);
-       export->child.groups = pwm_attr_groups;
+       export->child.groups = pwm_groups;
        dev_set_name(&export->child, "pwm%u", pwm->hwpwm);
 
        ret = device_register(&export->child);