From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Ben Dooks <ben-linux@fluff.org>,
Kukjin Kim <kgene.kim@samsung.com>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
devicetree@vger.kernel.org, linux-pwm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 02/12] pwm-backlight: Refactor backlight power on/off
Date: Mon, 7 Oct 2013 13:37:36 +0200 [thread overview]
Message-ID: <1381145866-445-3-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381145866-445-1-git-send-email-treding@nvidia.com>
In preparation for adding an optional regulator and enable GPIO to the
driver, split the power on and power off sequences into separate
functions to reduce code duplication at the multiple call sites.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Changes in v2:
- add back pwm_config(..., 0, ...) call on power off
- move whitespace cleanups to separate patch
drivers/video/backlight/pwm_bl.c | 53 +++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 22 deletions(-)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 774bce3..ab9d5e6 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -35,6 +35,31 @@ struct pwm_bl_data {
void (*exit)(struct device *);
};
+static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness,
+ int max)
+{
+ int duty_cycle, err;
+
+ if (pb->levels) {
+ duty_cycle = pb->levels[brightness];
+ max = pb->levels[max];
+ } else {
+ duty_cycle = brightness;
+ }
+
+ duty_cycle = (duty_cycle * (pb->period - pb->lth_brightness) / max) +
+ pb->lth_brightness;
+
+ pwm_config(pb->pwm, duty_cycle, pb->period);
+ pwm_enable(pb->pwm);
+}
+
+static void pwm_backlight_power_off(struct pwm_bl_data *pb)
+{
+ pwm_config(pb->pwm, 0, pb->period);
+ pwm_disable(pb->pwm);
+}
+
static int pwm_backlight_update_status(struct backlight_device *bl)
{
struct pwm_bl_data *pb = bl_get_data(bl);
@@ -49,24 +74,10 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
if (pb->notify)
brightness = pb->notify(pb->dev, brightness);
- if (brightness == 0) {
- pwm_config(pb->pwm, 0, pb->period);
- pwm_disable(pb->pwm);
- } else {
- int duty_cycle;
-
- if (pb->levels) {
- duty_cycle = pb->levels[brightness];
- max = pb->levels[max];
- } else {
- duty_cycle = brightness;
- }
-
- duty_cycle = pb->lth_brightness +
- (duty_cycle * (pb->period - pb->lth_brightness) / max);
- pwm_config(pb->pwm, duty_cycle, pb->period);
- pwm_enable(pb->pwm);
- }
+ if (brightness > 0)
+ pwm_backlight_power_on(pb, brightness, max);
+ else
+ pwm_backlight_power_off(pb);
if (pb->notify_after)
pb->notify_after(pb->dev, brightness);
@@ -267,8 +278,7 @@ static int pwm_backlight_remove(struct platform_device *pdev)
struct pwm_bl_data *pb = bl_get_data(bl);
backlight_device_unregister(bl);
- pwm_config(pb->pwm, 0, pb->period);
- pwm_disable(pb->pwm);
+ pwm_backlight_power_off(pb);
if (pb->exit)
pb->exit(&pdev->dev);
@@ -285,8 +295,7 @@ static int pwm_backlight_suspend(struct device *dev)
if (pb->notify)
pb->notify(pb->dev, 0);
- pwm_config(pb->pwm, 0, pb->period);
- pwm_disable(pb->pwm);
+ pwm_backlight_power_off(pb);
if (pb->notify_after)
pb->notify_after(pb->dev, 0);
--
1.8.4
next prev parent reply other threads:[~2013-10-07 11:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-07 11:37 [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support Thierry Reding
2013-10-07 11:37 ` Thierry Reding [this message]
2013-10-07 11:37 ` [PATCH v2 03/12] pwm-backlight: Track enable state Thierry Reding
2013-10-07 11:37 ` [PATCH v2 04/12] pwm-backlight: Add optional enable GPIO Thierry Reding
[not found] ` <1381145866-445-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-10-07 11:37 ` [PATCH v2 01/12] pwm-backlight: Improve readability Thierry Reding
2013-10-07 11:37 ` [PATCH v2 05/12] ARM: OMAP: Initialize PWM backlight enable_gpio field Thierry Reding
2013-10-07 11:37 ` [PATCH v2 06/12] ARM: pxa: " Thierry Reding
2013-10-07 11:37 ` [PATCH v2 07/12] ARM: SAMSUNG: " Thierry Reding
2013-11-07 12:44 ` [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support Christian Gmeiner
2013-10-07 11:37 ` [PATCH v2 08/12] ARM: shmobile: Initialize PWM backlight enable_gpio field Thierry Reding
2013-10-07 11:37 ` [PATCH v2 09/12] unicore32: " Thierry Reding
2013-10-07 11:37 ` [PATCH v2 10/12] pwm-backlight: Use new " Thierry Reding
2013-10-07 11:37 ` [PATCH v2 11/12] pwm-backlight: Add power supply support Thierry Reding
2013-10-07 11:37 ` [PATCH v2 12/12] pwm-backlight: Allow backlight to remain disabled on boot Thierry Reding
[not found] ` <CAH9NwWfDRiQ3FegMyx1YBQ5jUgPvc7h2cxd3KgyeDdnsq6UgMw@mail.gmail.com>
2013-11-08 12:36 ` [PATCH v2 00/12] pwm-backlight: Add GPIO and power supply support Thierry Reding
[not found] ` <20131108123619.GC31551-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-11-08 13:58 ` Christian Gmeiner
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=1381145866-445-3-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=ben-linux@fluff.org \
--cc=devicetree@vger.kernel.org \
--cc=eric.y.miao@gmail.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=haojian.zhuang@gmail.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=tony@atomide.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).