From patchwork Thu Oct 31 17:57:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 3121611 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 641F1BEEB2 for ; Thu, 31 Oct 2013 18:00:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC5DA202AE for ; Thu, 31 Oct 2013 18:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 670102027D for ; Thu, 31 Oct 2013 18:00:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754564Ab3JaR7p (ORCPT ); Thu, 31 Oct 2013 13:59:45 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:52163 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754576Ab3JaR6U (ORCPT ); Thu, 31 Oct 2013 13:58:20 -0400 Received: by mail-la0-f41.google.com with SMTP id el20so2644131lab.28 for ; Thu, 31 Oct 2013 10:58:19 -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=FF/tsQLQN0JIRDEniu20PnZG41bGMY7JEnPu7uFyh5c=; b=aqvjzplf9Ck2qYpWdVwvm6y0uzZPfk9vHViFykUeoC1+hQ+Q2izgi1iet+YuaRiuXt tj/msUK1s783QL241Q6JbgRDNnN54rWeD3c5MsN5dz4F0Mx/M1Hp8GG7Ftu/5LDdTPUP 8OoxZXqRC5rT2K9EeASs8QLIDZq2g/QptAk7zWuQhIrTbB+bzCC0QOMsSjAzvQX7bBcp F4/Y3GR2YqfyDxtE1U7LY82HsJqufWiVvAMBiorUM75OPgFDnCO+SI8EXiqm8QLMGVba DdO5lqaxQfxsLuuTqzSRmjft8V3dYqmCQz8QgychOeJ5ZvXS3rz7yKC2KkyRoNWYF/b+ 01PQ== X-Received: by 10.152.10.99 with SMTP id h3mr2856961lab.13.1383242298998; Thu, 31 Oct 2013 10:58:18 -0700 (PDT) Received: from xi.terra (c193-14-141-227.cust.tele2.se. [193.14.141.227]) by mx.google.com with ESMTPSA id m13sm3462950lbo.11.2013.10.31.10.58.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Oct 2013 10:58:16 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.80.1) (envelope-from ) id 1VbwVY-00021F-S8; Thu, 31 Oct 2013 18:58:12 +0100 From: Johan Hovold To: Richard Purdie , Jingoo Han Cc: Nicolas Ferre , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Andrew Morton , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 8/9] backlight: atmel-pwm-bl: refactor gpio_on handling Date: Thu, 31 Oct 2013 18:57:43 +0100 Message-Id: <1383242264-7652-9-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1383242264-7652-1-git-send-email-jhovold@gmail.com> References: <1383064064-4983-1-git-send-email-jhovold@gmail.com> <1383242264-7652-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.3 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=unavailable 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. Acked-by: Jingoo Han Signed-off-by: Johan Hovold --- 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 c254209..bd1ed34 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);