| Message ID | 1347862847-2774-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 17, 2012 at 11:50:47AM +0530, Sachin Kamat wrote: > This file already makes use of device managed functions. > Convert pwm_get() too to use it. I find this description a bit confusing. pwm_get() is not converted, but rather the driver is converted to use devm_pwm_get() instead of pwm_get(). How about this: 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. If that's okay with you, I can just replace it before pushing so there's no need for you to resend. Thierry
On 17 September 2012 15:03, Thierry Reding <thierry.reding@avionic-design.de> wrote: > On Mon, Sep 17, 2012 at 11:50:47AM +0530, Sachin Kamat wrote: >> This file already makes use of device managed functions. >> Convert pwm_get() too to use it. > > I find this description a bit confusing. pwm_get() is not converted, but > rather the driver is converted to use devm_pwm_get() instead of > pwm_get(). > > How about this: > > 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. > > If that's okay with you, I can just replace it before pushing so there's > no need for you to resend. Your description sounds good. Please go ahead with it. Thanks > > Thierry
On Monday, September 17, 2012 6:33 PM Thierry Reding wrote > > On Mon, Sep 17, 2012 at 11:50:47AM +0530, Sachin Kamat wrote: > > This file already makes use of device managed functions. > > Convert pwm_get() too to use it. > > I find this description a bit confusing. pwm_get() is not converted, but > rather the driver is converted to use devm_pwm_get() instead of > pwm_get(). > > How about this: > > 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. > It looks good. Sachin, how about you? Best regards, Jingoo Han > If that's okay with you, I can just replace it before pushing so there's > no need for you to resend. > > Thierry -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 4965408..0c91023 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -218,7 +218,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) pb->exit = data->exit; pb->dev = &pdev->dev; - pb->pwm = pwm_get(&pdev->dev, NULL); + pb->pwm = devm_pwm_get(&pdev->dev, NULL); if (IS_ERR(pb->pwm)) { dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -251,7 +251,7 @@ static int pwm_backlight_probe(struct platform_device *pdev) if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); ret = PTR_ERR(bl); - goto err_bl; + goto err_alloc; } bl->props.brightness = data->dft_brightness; @@ -260,8 +260,6 @@ static int pwm_backlight_probe(struct platform_device *pdev) platform_set_drvdata(pdev, bl); return 0; -err_bl: - pwm_put(pb->pwm); err_alloc: if (data->exit) data->exit(&pdev->dev); @@ -276,7 +274,6 @@ static int pwm_backlight_remove(struct platform_device *pdev) backlight_device_unregister(bl); pwm_config(pb->pwm, 0, pb->period); pwm_disable(pb->pwm); - pwm_put(pb->pwm); if (pb->exit) pb->exit(&pdev->dev); return 0;