From patchwork Tue Oct 22 17:26:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 3084161 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3676ABF924 for ; Tue, 22 Oct 2013 17:28:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 575EC201EF for ; Tue, 22 Oct 2013 17:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 384A120211 for ; Tue, 22 Oct 2013 17:28:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754475Ab3JVR2z (ORCPT ); Tue, 22 Oct 2013 13:28:55 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:44298 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753861Ab3JVR1P (ORCPT ); Tue, 22 Oct 2013 13:27:15 -0400 Received: by mail-lb0-f181.google.com with SMTP id x18so5017119lbi.40 for ; Tue, 22 Oct 2013 10:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CwbSej0+uAeQjK46HqwzkBotFC1FqMZ8N11RbYMxMPI=; b=L49FPell88tB8lCptReNIHlBTgUl1vewY60kLKk5sfVKHNikjw1uiFx9x4zqnR8RSy ucgcfFt+LsPB1COX3jeX3TU6HUZVfQ4VITdb6kIeqGGP0nR37DupqBgVfq+Zd6WGPHkz rzYQwoYk8K6nqcbClhe+PQ0/HkhEWYW/4IosnwCnPOcU5Z9jSJvML6XmlanNetb8R4Uz q6phDM+yKb2AJOiMxCOZFeWYVgVxSTt4v3cpc0dRqLA76N0V+ASMwzjGtz6XbZA3QVbA PoQC/ZvSG+1mKrUMqoR/pyOh1bomIcmZy1W6g3FsB1Q0qU0//03G4aTb+f4EeziVsjhV ATJg== X-Received: by 10.112.198.39 with SMTP id iz7mr17980168lbc.24.1382462834506; Tue, 22 Oct 2013 10:27:14 -0700 (PDT) Received: from xi.terra (c193-14-141-227.cust.tele2.se. [193.14.141.227]) by mx.google.com with ESMTPSA id i3sm21860056laf.4.2013.10.22.10.27.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 22 Oct 2013 10:27:11 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.80.1) (envelope-from ) id 1VYfja-0007SU-7x; Tue, 22 Oct 2013 19:27:10 +0200 From: Johan Hovold To: Richard Purdie , Jingoo Han Cc: Nicolas Ferre , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 8/9] backlight: atmel-pwm-bl: refactor gpio_on handling Date: Tue, 22 Oct 2013 19:26:58 +0200 Message-Id: <1382462819-28576-9-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1382462819-28576-1-git-send-email-jhovold@gmail.com> References: <1382462819-28576-1-git-send-email-jhovold@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add helper function to control the gpio_on signal. Signed-off-by: Johan Hovold Acked-by: Jingoo Han --- drivers/video/backlight/atmel-pwm-bl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c index ffc30d2..1277e0c 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/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(struct backlight_device *bd) 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 atmel_pwm_bl_remove(struct platform_device *pdev) { 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);