Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b62db5 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Torvalds
Browse files

backlight: atmel-pwm-bl: refactor gpio_on handling 



Add helper function to control the gpio_on signal.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ada4550

drivers/video/backlight/atmel-pwm-bl.c

+11 −12
Original line number Original line Diff line number Diff line
@@ -26,6 +26,14 @@ struct atmel_pwm_bl { 
	int					gpio_on;

	int					gpio_on;

};

};





static void atmel_pwm_bl_set_gpio_on(struct atmel_pwm_bl *pwmbl, int on)

{

	if (!gpio_is_valid(pwmbl->gpio_on))

		return;



	gpio_set_value(pwmbl->gpio_on, on ^ pwmbl->pdata->on_active_low);

}



static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)

static int atmel_pwm_bl_set_intensity(struct backlight_device *bd)

{

{

	struct atmel_pwm_bl *pwmbl = bl_get_data(bd);

	struct atmel_pwm_bl *pwmbl = bl_get_data(bd);
@@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(struct backlight_device *bd) 
		pwm_duty = pwmbl->pdata->pwm_duty_min;

		pwm_duty = pwmbl->pdata->pwm_duty_min;





	if (!intensity) {

	if (!intensity) {

		if (gpio_is_valid(pwmbl->gpio_on)) {

		atmel_pwm_bl_set_gpio_on(pwmbl, 0);

			gpio_set_value(pwmbl->gpio_on,

					0 ^ pwmbl->pdata->on_active_low);

		}

		pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);

		pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);

		pwm_channel_disable(&pwmbl->pwmc);

		pwm_channel_disable(&pwmbl->pwmc);

	} else {

	} else {

		pwm_channel_enable(&pwmbl->pwmc);

		pwm_channel_enable(&pwmbl->pwmc);

		pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);

		pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty);

		if (gpio_is_valid(pwmbl->gpio_on)) {

		atmel_pwm_bl_set_gpio_on(pwmbl, 1);

			gpio_set_value(pwmbl->gpio_on,

					1 ^ pwmbl->pdata->on_active_low);

		}

	}

	}





	return 0;

	return 0;
@@ -196,10 +198,7 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) 
{

{

	struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);

	struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev);





	if (gpio_is_valid(pwmbl->gpio_on)) {

	atmel_pwm_bl_set_gpio_on(pwmbl, 0);

		gpio_set_value(pwmbl->gpio_on,

					0 ^ pwmbl->pdata->on_active_low);

	}

	pwm_channel_disable(&pwmbl->pwmc);

	pwm_channel_disable(&pwmbl->pwmc);

	pwm_channel_free(&pwmbl->pwmc);

	pwm_channel_free(&pwmbl->pwmc);