Skip to content

Commit

Permalink
pwm-backlight: Refactor backlight power on/off
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thierry Reding authored and Thierry Reding committed Oct 16, 2013
1 parent 668e63c commit 62b744a
Showing 1 changed file with 31 additions and 22 deletions.
53 changes: 31 additions & 22 deletions drivers/video/backlight/pwm_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 62b744a

Please sign in to comment.