Skip to content

Commit

Permalink
leds: leds-pwm: Convert to use devm_get_pwm
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Bryan Wu committed Feb 2, 2013
1 parent 8614fb4 commit 9ea6cda
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
19 changes: 6 additions & 13 deletions drivers/leds/leds-pwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/leds_pwm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9ea6cda

Please sign in to comment.