drivers/base/memory.c: clean up section counting

[cascardo/linux.git] / drivers / leds / leds-ktd2692.c

diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
index feca07b..bf23ba1 100644 (file)
--- a/drivers/leds/leds-ktd2692.c
+++ b/drivers/leds/leds-ktd2692.c
@@ -18,7 +18,6 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
-#include <linux/workqueue.h>
 
 /* Value related the movie mode */
 #define KTD2692_MOVIE_MODE_CURRENT_LEVELS      16
@@ -82,7 +81,6 @@ struct ktd2692_context {
        /* secures access to the device */
        struct mutex lock;
        struct regulator *regulator;
-       struct work_struct work_brightness_set;
 
        struct gpio_desc *aux_gpio;
        struct gpio_desc *ctrl_gpio;
@@ -158,9 +156,12 @@ static void ktd2692_expresswire_write(struct ktd2692_context *led, u8 value)
        ktd2692_expresswire_end(led);
 }
 
-static void ktd2692_brightness_set(struct ktd2692_context *led,
-                                  enum led_brightness brightness)
+static int ktd2692_led_brightness_set(struct led_classdev *led_cdev,
+                                      enum led_brightness brightness)
 {
+       struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
+       struct ktd2692_context *led = fled_cdev_to_led(fled_cdev);
+
        mutex_lock(&led->lock);
 
        if (brightness == LED_OFF) {
@@ -174,33 +175,6 @@ static void ktd2692_brightness_set(struct ktd2692_context *led,
 
        ktd2692_expresswire_write(led, led->mode | KTD2692_REG_MODE_BASE);
        mutex_unlock(&led->lock);
-}
-
-static void ktd2692_brightness_set_work(struct work_struct *work)
-{
-       struct ktd2692_context *led =
-               container_of(work, struct ktd2692_context, work_brightness_set);
-
-       ktd2692_brightness_set(led, led->torch_brightness);
-}
-
-static void ktd2692_led_brightness_set(struct led_classdev *led_cdev,
-                                      enum led_brightness brightness)
-{
-       struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
-       struct ktd2692_context *led = fled_cdev_to_led(fled_cdev);
-
-       led->torch_brightness = brightness;
-       schedule_work(&led->work_brightness_set);
-}
-
-static int ktd2692_led_brightness_set_sync(struct led_classdev *led_cdev,
-                                          enum led_brightness brightness)
-{
-       struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(led_cdev);
-       struct ktd2692_context *led = fled_cdev_to_led(fled_cdev);
-
-       ktd2692_brightness_set(led, brightness);
 
        return 0;
 }
@@ -332,21 +306,24 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
                                   &cfg->movie_max_microamp);
        if (ret) {
                dev_err(dev, "failed to parse led-max-microamp\n");
-               return ret;
+               goto err_parse_dt;
        }
 
        ret = of_property_read_u32(child_node, "flash-max-microamp",
                                   &cfg->flash_max_microamp);
        if (ret) {
                dev_err(dev, "failed to parse flash-max-microamp\n");
-               return ret;
+               goto err_parse_dt;
        }
 
        ret = of_property_read_u32(child_node, "flash-max-timeout-us",
                                   &cfg->flash_max_timeout);
-       if (ret)
+       if (ret) {
                dev_err(dev, "failed to parse flash-max-timeout-us\n");
+               goto err_parse_dt;
+       }
 
+err_parse_dt:
        of_node_put(child_node);
        return ret;
 }
@@ -381,12 +358,10 @@ static int ktd2692_probe(struct platform_device *pdev)
        fled_cdev->ops = &flash_ops;
 
        led_cdev->max_brightness = led_cfg.max_brightness;
-       led_cdev->brightness_set = ktd2692_led_brightness_set;
-       led_cdev->brightness_set_sync = ktd2692_led_brightness_set_sync;
+       led_cdev->brightness_set_blocking = ktd2692_led_brightness_set;
        led_cdev->flags |= LED_CORE_SUSPENDRESUME | LED_DEV_CAP_FLASH;
 
        mutex_init(&led->lock);
-       INIT_WORK(&led->work_brightness_set, ktd2692_brightness_set_work);
 
        platform_set_drvdata(pdev, led);
 
@@ -408,7 +383,6 @@ static int ktd2692_remove(struct platform_device *pdev)
        int ret;
 
        led_classdev_flash_unregister(&led->fled_cdev);
-       cancel_work_sync(&led->work_brightness_set);
 
        if (led->regulator) {
                ret = regulator_disable(led->regulator);