Subject: + backlight-atmel-pwm-bl-refactor-gpio_on-handling.patch added to -mm tree To: jhovold@xxxxxxxxx,jg1.han@xxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 01 Nov 2013 13:07:38 -0700 The patch titled Subject: backlight: atmel-pwm-bl: refactor gpio_on handling has been added to the -mm tree. Its filename is backlight-atmel-pwm-bl-refactor-gpio_on-handling.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/backlight-atmel-pwm-bl-refactor-gpio_on-handling.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/backlight-atmel-pwm-bl-refactor-gpio_on-handling.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Johan Hovold <jhovold@xxxxxxxxx> Subject: backlight: atmel-pwm-bl: refactor gpio_on handling Add helper function to control the gpio_on signal. Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx> Acked-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff -puN drivers/video/backlight/atmel-pwm-bl.c~backlight-atmel-pwm-bl-refactor-gpio_on-handling drivers/video/backlight/atmel-pwm-bl.c --- a/drivers/video/backlight/atmel-pwm-bl.c~backlight-atmel-pwm-bl-refactor-gpio_on-handling +++ a/drivers/video/backlight/atmel-pwm-bl.c @@ -26,6 +26,14 @@ struct atmel_pwm_bl { 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) { struct atmel_pwm_bl *pwmbl = bl_get_data(bd); @@ -48,19 +56,13 @@ static int atmel_pwm_bl_set_intensity(st pwm_duty = pwmbl->pdata->pwm_duty_min; if (!intensity) { - if (gpio_is_valid(pwmbl->gpio_on)) { - gpio_set_value(pwmbl->gpio_on, - 0 ^ pwmbl->pdata->on_active_low); - } + atmel_pwm_bl_set_gpio_on(pwmbl, 0); pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty); pwm_channel_disable(&pwmbl->pwmc); } else { pwm_channel_enable(&pwmbl->pwmc); pwm_channel_writel(&pwmbl->pwmc, PWM_CUPD, pwm_duty); - if (gpio_is_valid(pwmbl->gpio_on)) { - gpio_set_value(pwmbl->gpio_on, - 1 ^ pwmbl->pdata->on_active_low); - } + atmel_pwm_bl_set_gpio_on(pwmbl, 1); } return 0; @@ -196,10 +198,7 @@ static int __exit atmel_pwm_bl_remove(st { struct atmel_pwm_bl *pwmbl = platform_get_drvdata(pdev); - if (gpio_is_valid(pwmbl->gpio_on)) { - gpio_set_value(pwmbl->gpio_on, - 0 ^ pwmbl->pdata->on_active_low); - } + atmel_pwm_bl_set_gpio_on(pwmbl, 0); pwm_channel_disable(&pwmbl->pwmc); pwm_channel_free(&pwmbl->pwmc); _ Patches currently in -mm which might be from jhovold@xxxxxxxxx are backlight-atmel-pwm-bl-fix-reported-brightness.patch backlight-atmel-pwm-bl-fix-gpio-polarity-in-remove.patch backlight-atmel-pwm-bl-fix-module-autoload.patch backlight-atmel-pwm-bl-clean-up-probe-error-handling.patch backlight-atmel-pwm-bl-clean-up-get_intensity.patch backlight-atmel-pwm-bl-remove-unused-include.patch backlight-atmel-pwm-bl-use-gpio_is_valid.patch backlight-atmel-pwm-bl-refactor-gpio_on-handling.patch backlight-atmel-pwm-bl-use-gpio_request_one.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html