diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-09-17 02:20:47 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@avionic-design.de> | 2012-10-05 14:56:39 -0400 |
commit | 60ce70285b4d3b933eea15e494a9b35fe85b19b7 (patch) | |
tree | f8b5282ac6901b632fc7041c1b52f36bbe59a64f /drivers/video/backlight | |
parent | 6173f8f4ed9c2bd4184908e35f46755a0d14b0f2 (diff) |
pwm-backlight: Use devm_pwm_get() instead of pwm_get()
Managed versions of the pwm_get() and pwm_put() functions were recently
added to the PWM framework. They can be used to simplify cleanup in the
error paths and the device removal callback.
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/pwm_bl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 995f0164c9b0..069983ca49ff 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c | |||
@@ -213,7 +213,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) | |||
213 | pb->exit = data->exit; | 213 | pb->exit = data->exit; |
214 | pb->dev = &pdev->dev; | 214 | pb->dev = &pdev->dev; |
215 | 215 | ||
216 | pb->pwm = pwm_get(&pdev->dev, NULL); | 216 | pb->pwm = devm_pwm_get(&pdev->dev, NULL); |
217 | if (IS_ERR(pb->pwm)) { | 217 | if (IS_ERR(pb->pwm)) { |
218 | dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); | 218 | dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); |
219 | 219 | ||
@@ -246,7 +246,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) | |||
246 | if (IS_ERR(bl)) { | 246 | if (IS_ERR(bl)) { |
247 | dev_err(&pdev->dev, "failed to register backlight\n"); | 247 | dev_err(&pdev->dev, "failed to register backlight\n"); |
248 | ret = PTR_ERR(bl); | 248 | ret = PTR_ERR(bl); |
249 | goto err_bl; | 249 | goto err_alloc; |
250 | } | 250 | } |
251 | 251 | ||
252 | bl->props.brightness = data->dft_brightness; | 252 | bl->props.brightness = data->dft_brightness; |
@@ -255,8 +255,6 @@ static int pwm_backlight_probe(struct platform_device *pdev) | |||
255 | platform_set_drvdata(pdev, bl); | 255 | platform_set_drvdata(pdev, bl); |
256 | return 0; | 256 | return 0; |
257 | 257 | ||
258 | err_bl: | ||
259 | pwm_put(pb->pwm); | ||
260 | err_alloc: | 258 | err_alloc: |
261 | if (data->exit) | 259 | if (data->exit) |
262 | data->exit(&pdev->dev); | 260 | data->exit(&pdev->dev); |
@@ -271,7 +269,6 @@ static int pwm_backlight_remove(struct platform_device *pdev) | |||
271 | backlight_device_unregister(bl); | 269 | backlight_device_unregister(bl); |
272 | pwm_config(pb->pwm, 0, pb->period); | 270 | pwm_config(pb->pwm, 0, pb->period); |
273 | pwm_disable(pb->pwm); | 271 | pwm_disable(pb->pwm); |
274 | pwm_put(pb->pwm); | ||
275 | if (pb->exit) | 272 | if (pb->exit) |
276 | pb->exit(&pdev->dev); | 273 | pb->exit(&pdev->dev); |
277 | return 0; | 274 | return 0; |