leds: leds-pwm: Convert to use devm_get_pwm

Update the driver to use the new API for requesting pwm so we can take
advantage of the pwm_lookup table to find the correct pwm to be used for the
LED functionality.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index 2157524f277c2d7818713f1774726c27069d60b6..351257c2a7b8262fc5b47d97eb1e0e9ea62d5c79 100644 (file)
--- a/drivers/leds/leds-pwm.c
+++ b/drivers/leds/leds-pwm.c
@@ -67,12 +67,11 @@ static int led_pwm_probe(struct platform_device *pdev)
                cur_led = &pdata->leds[i];
                led_dat = &leds_data[i];
 
-               led_dat->pwm = pwm_request(cur_led->pwm_id,
-                               cur_led->name);
+               led_dat->pwm = devm_pwm_get(&pdev->dev, cur_led->name);
                if (IS_ERR(led_dat->pwm)) {
                        ret = PTR_ERR(led_dat->pwm);
-                       dev_err(&pdev->dev, "unable to request PWM %d\n",
-                                       cur_led->pwm_id);
+                       dev_err(&pdev->dev, "unable to request PWM for %s\n",
+                               cur_led->name);
                        goto err;
                }
 
@@ -86,10 +85,8 @@ static int led_pwm_probe(struct platform_device *pdev)
                led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
 
                ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
-               if (ret < 0) {
-                       pwm_free(led_dat->pwm);
+               if (ret < 0)
                        goto err;
-               }
        }
 
        platform_set_drvdata(pdev, leds_data);
@@ -98,10 +95,8 @@ static int led_pwm_probe(struct platform_device *pdev)
 
 err:
        if (i > 0) {
-               for (i = i - 1; i >= 0; i--) {
+               for (i = i - 1; i >= 0; i--)
                        led_classdev_unregister(&leds_data[i].cdev);
-                       pwm_free(leds_data[i].pwm);
-               }
        }
 
        return ret;
@@ -115,10 +110,8 @@ static int led_pwm_remove(struct platform_device *pdev)
 
        leds_data = platform_get_drvdata(pdev);
 
-       for (i = 0; i < pdata->num_leds; i++) {
+       for (i = 0; i < pdata->num_leds; i++)
                led_classdev_unregister(&leds_data[i].cdev);
-               pwm_free(leds_data[i].pwm);
-       }
 
        return 0;
 }

diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
index 33a07116748910599016e6ab9f94186711ed49c4..a65e9646e4b15e5312b0af9904e66ed41514cb8b 100644 (file)
--- a/include/linux/leds_pwm.h
+++ b/include/linux/leds_pwm.h
@@ -7,7 +7,7 @@
 struct led_pwm {
        const char      *name;
        const char      *default_trigger;
-       unsigned        pwm_id;
+       unsigned        pwm_id __deprecated;
        u8              active_low;
        unsigned        max_brightness;
        unsigned        pwm_period_ns;