Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / leds / leds-lp55xx-common.c

diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c
index 88317b4f7bf3abf70e4337a12aa682646e8a2e56..77c26bc32eed561a26c4ccb45b3238e60184d017 100644 (file)
--- a/drivers/leds/leds-lp55xx-common.c
+++ b/drivers/leds/leds-lp55xx-common.c
@@ -127,15 +127,12 @@ static DEVICE_ATTR(led_current, S_IRUGO | S_IWUSR, lp55xx_show_current,
                lp55xx_store_current);
 static DEVICE_ATTR(max_current, S_IRUGO , lp55xx_show_max_current, NULL);
 
-static struct attribute *lp55xx_led_attributes[] = {
+static struct attribute *lp55xx_led_attrs[] = {
        &dev_attr_led_current.attr,
        &dev_attr_max_current.attr,
        NULL,
 };
-
-static struct attribute_group lp55xx_led_attr_group = {
-       .attrs = lp55xx_led_attributes
-};
+ATTRIBUTE_GROUPS(lp55xx_led);
 
 static void lp55xx_set_brightness(struct led_classdev *cdev,
                             enum led_brightness brightness)
@@ -176,6 +173,7 @@ static int lp55xx_init_led(struct lp55xx_led *led,
        }
 
        led->cdev.brightness_set = lp55xx_set_brightness;
+       led->cdev.groups = lp55xx_led_groups;
 
        if (pdata->led_config[chan].name) {
                led->cdev.name = pdata->led_config[chan].name;
@@ -185,24 +183,12 @@ static int lp55xx_init_led(struct lp55xx_led *led,
                led->cdev.name = name;
        }
 
-       /*
-        * register led class device for each channel and
-        * add device attributes
-        */
-
        ret = led_classdev_register(dev, &led->cdev);
        if (ret) {
                dev_err(dev, "led register err: %d\n", ret);
                return ret;
        }
 
-       ret = sysfs_create_group(&led->cdev.dev->kobj, &lp55xx_led_attr_group);
-       if (ret) {
-               dev_err(dev, "led sysfs err: %d\n", ret);
-               led_classdev_unregister(&led->cdev);
-               return ret;
-       }
-
        return 0;
 }