From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> To: Thierry Reding <thierry.reding@gmail.com>, Lee Jones <lee.jones@linaro.org>, Jingoo Han <jg1.han@samsung.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>, linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2] backlight: pwm: reject legacy pwm request for device defined in dt Date: Mon, 12 Oct 2015 15:29:03 +0300 [thread overview] Message-ID: <1444652943-19712-1-git-send-email-vladimir_zapolskiy@mentor.com> (raw) Platform PWM backlight data provided by board's device tree should be complete enough to successfully request a pwm device using pwm_get() API. This change fixes a bug, when an arbitrary (first found) PWM is connected to a "pwm-backlight" compatible device, when explicit PWM device reference is not given. Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt already describes "pwms" as a required property, instead of blind selection of a potentially wrong PWM reject legacy PWM device registration request, leave legacy API only for non-dt cases. Based on initial implementation done by Dmitry Eremin-Solenikov. Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Acked-by: Thierry Reding <thierry.reding@gmail.com> Acked-by: Lee Jones <lee.jones@linaro.org> --- The change is based on lee-backlight/for-backlight-next Changes from v1 to v2: * rebased on top of Nicolas' commit 68feaca0b13 ("backlight: pwm: Handle EPROBE_DEFER while requesting the PWM") Links to previous discussions of the change: * https://patchwork.ozlabs.org/patch/483993/ * https://patchwork.ozlabs.org/patch/398849/ drivers/video/backlight/pwm_bl.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index eff379b..ae3c6b6 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -271,19 +271,18 @@ static int pwm_backlight_probe(struct platform_device *pdev) } pb->pwm = devm_pwm_get(&pdev->dev, NULL); - if (IS_ERR(pb->pwm)) { - ret = PTR_ERR(pb->pwm); - if (ret == -EPROBE_DEFER) - goto err_alloc; - + if (IS_ERR(pb->pwm) && PTR_ERR(pb->pwm) != -EPROBE_DEFER + && !pdev->dev.of_node) { dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); pb->legacy = true; pb->pwm = pwm_request(data->pwm_id, "pwm-backlight"); - if (IS_ERR(pb->pwm)) { - dev_err(&pdev->dev, "unable to request legacy PWM\n"); - ret = PTR_ERR(pb->pwm); - goto err_alloc; - } + } + + if (IS_ERR(pb->pwm)) { + ret = PTR_ERR(pb->pwm); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "unable to request PWM\n"); + goto err_alloc; } dev_dbg(&pdev->dev, "got pwm for backlight\n"); -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> To: Thierry Reding <thierry.reding@gmail.com>, Lee Jones <lee.jones@linaro.org>, Jingoo Han <jg1.han@samsung.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>, linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2] backlight: pwm: reject legacy pwm request for device defined in dt Date: Mon, 12 Oct 2015 12:29:03 +0000 [thread overview] Message-ID: <1444652943-19712-1-git-send-email-vladimir_zapolskiy@mentor.com> (raw) Platform PWM backlight data provided by board's device tree should be complete enough to successfully request a pwm device using pwm_get() API. This change fixes a bug, when an arbitrary (first found) PWM is connected to a "pwm-backlight" compatible device, when explicit PWM device reference is not given. Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt already describes "pwms" as a required property, instead of blind selection of a potentially wrong PWM reject legacy PWM device registration request, leave legacy API only for non-dt cases. Based on initial implementation done by Dmitry Eremin-Solenikov. Reported-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> Acked-by: Thierry Reding <thierry.reding@gmail.com> Acked-by: Lee Jones <lee.jones@linaro.org> --- The change is based on lee-backlight/for-backlight-next Changes from v1 to v2: * rebased on top of Nicolas' commit 68feaca0b13 ("backlight: pwm: Handle EPROBE_DEFER while requesting the PWM") Links to previous discussions of the change: * https://patchwork.ozlabs.org/patch/483993/ * https://patchwork.ozlabs.org/patch/398849/ drivers/video/backlight/pwm_bl.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index eff379b..ae3c6b6 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -271,19 +271,18 @@ static int pwm_backlight_probe(struct platform_device *pdev) } pb->pwm = devm_pwm_get(&pdev->dev, NULL); - if (IS_ERR(pb->pwm)) { - ret = PTR_ERR(pb->pwm); - if (ret = -EPROBE_DEFER) - goto err_alloc; - + if (IS_ERR(pb->pwm) && PTR_ERR(pb->pwm) != -EPROBE_DEFER + && !pdev->dev.of_node) { dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); pb->legacy = true; pb->pwm = pwm_request(data->pwm_id, "pwm-backlight"); - if (IS_ERR(pb->pwm)) { - dev_err(&pdev->dev, "unable to request legacy PWM\n"); - ret = PTR_ERR(pb->pwm); - goto err_alloc; - } + } + + if (IS_ERR(pb->pwm)) { + ret = PTR_ERR(pb->pwm); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "unable to request PWM\n"); + goto err_alloc; } dev_dbg(&pdev->dev, "got pwm for backlight\n"); -- 2.5.0
next reply other threads:[~2015-10-12 12:30 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-12 12:29 Vladimir Zapolskiy [this message] 2015-10-12 12:29 ` [PATCH v2] backlight: pwm: reject legacy pwm request for device defined in dt Vladimir Zapolskiy 2015-10-12 13:16 ` Nicolas Ferre 2015-10-12 13:16 ` Nicolas Ferre 2015-10-12 13:30 ` Boris Brezillon 2015-10-12 13:30 ` Boris Brezillon 2015-10-12 13:54 ` Vladimir Zapolskiy 2015-10-12 13:54 ` Vladimir Zapolskiy 2015-10-12 14:06 ` Boris Brezillon 2015-10-12 14:06 ` Boris Brezillon 2015-10-12 14:19 ` Vladimir Zapolskiy 2015-10-12 14:19 ` Vladimir Zapolskiy 2015-10-12 15:19 ` Boris Brezillon 2015-10-12 15:19 ` Boris Brezillon 2015-10-12 15:32 ` Vladimir Zapolskiy 2015-10-12 15:32 ` Vladimir Zapolskiy 2015-10-12 17:11 ` Robert Jarzmik 2015-10-12 17:11 ` Robert Jarzmik 2015-10-13 7:29 ` Lee Jones 2015-10-13 7:29 ` Lee Jones 2015-10-15 10:45 ` Vladimir Zapolskiy 2015-10-15 10:45 ` Vladimir Zapolskiy 2015-10-13 9:21 ` Robert Jarzmik 2015-10-13 9:21 ` Robert Jarzmik 2015-10-15 11:03 ` Lee Jones 2015-10-15 11:03 ` Lee Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1444652943-19712-1-git-send-email-vladimir_zapolskiy@mentor.com \ --to=vladimir_zapolskiy@mentor.com \ --cc=jg1.han@samsung.com \ --cc=lee.jones@linaro.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=nicolas.ferre@atmel.com \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.