leds: activity trigger: simplifications from core changes

The trigger core learned error handling for the activate callback and
can handle device attributes now. This allows simplifying the driver
considerably. Note that .deactivate() is only called when .activate()
succeeded, so the check for .activated can go away in .deactivate().

Also make use of module_led_trigger() and the accessor function to get
and set trigger_data.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

1 files changed, 16 insertions, 22 deletions

diff --git a/drivers/leds/trigger/ledtrig-activity.c b/drivers/leds/trigger/ledtrig-activity.c
index 2fc065fb1754..bcbf41c90c30 100644
--- a/drivers/leds/trigger/ledtrig-activity.c
+++ b/drivers/leds/trigger/ledtrig-activity.c
@@ -152,8 +152,7 @@ static void led_activity_function(struct timer_list *t)
 static ssize_t led_invert_show(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
-        struct led_classdev *led_cdev = dev_get_drvdata(dev);
-        struct activity_data *activity_data = led_cdev->trigger_data;
+        struct activity_data *activity_data = led_trigger_get_drvdata(dev);
 
         return sprintf(buf, "%u\n", activity_data->invert);
 }
@@ -162,8 +161,7 @@ static ssize_t led_invert_store(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf, size_t size)
 {
-        struct led_classdev *led_cdev = dev_get_drvdata(dev);
-        struct activity_data *activity_data = led_cdev->trigger_data;
+        struct activity_data *activity_data = led_trigger_get_drvdata(dev);
         unsigned long state;
         int ret;
 
@@ -178,21 +176,21 @@ static ssize_t led_invert_store(struct device *dev,
 
 static DEVICE_ATTR(invert, 0644, led_invert_show, led_invert_store);
 
+static struct attribute *activity_led_attrs[] = {
+        &dev_attr_invert.attr,
+        NULL
+};
+ATTRIBUTE_GROUPS(activity_led);
+
 static int activity_activate(struct led_classdev *led_cdev)
 {
         struct activity_data *activity_data;
-        int rc;
 
         activity_data = kzalloc(sizeof(*activity_data), GFP_KERNEL);
         if (!activity_data)
-                return 0;
+                return -ENOMEM;
 
-        led_cdev->trigger_data = activity_data;
-        rc = device_create_file(led_cdev->dev, &dev_attr_invert);
-        if (rc) {
-                kfree(led_cdev->trigger_data);
-                return 0;
-        }
+        led_set_trigger_data(led_cdev, activity_data);
 
         activity_data->led_cdev = led_cdev;
         timer_setup(&activity_data->timer, led_activity_function, 0);
@@ -200,28 +198,24 @@ static int activity_activate(struct led_classdev *led_cdev)
                 led_cdev->blink_brightness = led_cdev->max_brightness;
         led_activity_function(&activity_data->timer);
         set_bit(LED_BLINK_SW, &led_cdev->work_flags);
-        led_cdev->activated = true;
 
         return 0;
 }
 
 static void activity_deactivate(struct led_classdev *led_cdev)
 {
-        struct activity_data *activity_data = led_cdev->trigger_data;
-
-        if (led_cdev->activated) {
-                del_timer_sync(&activity_data->timer);
-                device_remove_file(led_cdev->dev, &dev_attr_invert);
-                kfree(activity_data);
-                clear_bit(LED_BLINK_SW, &led_cdev->work_flags);
-                led_cdev->activated = false;
-        }
+        struct activity_data *activity_data = led_get_trigger_data(led_cdev);
+
+        del_timer_sync(&activity_data->timer);
+        kfree(activity_data);
+        clear_bit(LED_BLINK_SW, &led_cdev->work_flags);
 }
 
 static struct led_trigger activity_led_trigger = {
         .name       = "activity",
         .activate   = activity_activate,
         .deactivate = activity_deactivate,
+        .groups     = activity_led_groups,
 };
 
 static int activity_reboot_notifier(struct notifier_block *nb,