From patchwork Mon Mar 23 12:18:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: grygorii.strashko@linaro.org X-Patchwork-Id: 453403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8725114010F for ; Mon, 23 Mar 2015 23:22:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752710AbbCWMUZ (ORCPT ); Mon, 23 Mar 2015 08:20:25 -0400 Received: from mail-lb0-f176.google.com ([209.85.217.176]:35284 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbbCWMSf (ORCPT ); Mon, 23 Mar 2015 08:18:35 -0400 Received: by lbcgn8 with SMTP id gn8so116696256lbc.2 for ; Mon, 23 Mar 2015 05:18:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pXLUKSiToUnw21mIu18s6hGEoqhjXflC/qvk//2PDrM=; b=deYEeFe8eMQVwDC2qEQiB0IsuI1Kj7fWCqUpHTCt5k9JQl4Bqyzb2QNk3KPmEbsYei 8veRRvCkBs5Qd6MtpBC0XwqDfgBhHS5JfHXlnB+hTISYdY2zpm7sldNejUQFYKBqSqwY 0nFSB3gJk0eUSwsBpXQlZoYGsWf1u6IVrt2QdTH6WNbSanOzkZ84aw8l16NZYjLTK4xt muPhtCr1i354DYmgWu+MvnKcULjiMas78YvL+uP2GEmbDmIVQ4g6dpKS25gsYCL7kIe+ SbOmVVtcogdCUHsPWpsLCarCqvgKJZ2u99RCEMLa3EovKfg4Xt8UQ94JcDxSI0paFegm 9EYQ== X-Gm-Message-State: ALoCoQmM748xJBEwhHeNlkv1EyMF6dTsaRMz09nD9p7HwRp7uBUfcPgex1eKD0uKQVkp7Kgj9Yu6 X-Received: by 10.112.166.102 with SMTP id zf6mr79224780lbb.24.1427113114600; Mon, 23 Mar 2015 05:18:34 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id dy8sm150672lac.13.2015.03.23.05.18.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 23 Mar 2015 05:18:33 -0700 (PDT) From: To: Javier Martinez Canillas , Linus Walleij , Alexandre Courbot , ssantosh@kernel.org, Kevin Hilman , tony@atomide.com Cc: linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Grygorii Strashko Subject: [PATCH v2 1/8] gpio: omap: convert omap_gpio_is_input() to use gpio offset Date: Mon, 23 Mar 2015 14:18:23 +0200 Message-Id: <1427113110-20813-2-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427113110-20813-1-git-send-email-grygorii.strashko@linaro.org> References: <1427113110-20813-1-git-send-email-grygorii.strashko@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Grygorii Strashko Convert omap_gpio_is_input() to use GPIO offset instead of mask and, in such way, make code simpler and remove few lines of code. Tested-by: Tony Lindgren Tested-by: Aaro Koskinen Acked-by: Santosh Shilimkar Acked-by: Javier Martinez Canillas Signed-off-by: Grygorii Strashko --- drivers/gpio/gpio-omap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 2b2fc4b..ce71239 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -472,11 +472,11 @@ static void omap_disable_gpio_module(struct gpio_bank *bank, unsigned offset) } } -static int omap_gpio_is_input(struct gpio_bank *bank, int mask) +static int omap_gpio_is_input(struct gpio_bank *bank, unsigned offset) { void __iomem *reg = bank->base + bank->regs->direction; - return readl_relaxed(reg) & mask; + return readl_relaxed(reg) & BIT(offset); } static void omap_gpio_init_irq(struct gpio_bank *bank, unsigned gpio, @@ -519,7 +519,7 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) offset = GPIO_INDEX(bank, gpio); retval = omap_set_gpio_triggering(bank, offset, type); omap_gpio_init_irq(bank, gpio, offset); - if (!omap_gpio_is_input(bank, BIT(offset))) { + if (!omap_gpio_is_input(bank, offset)) { spin_unlock_irqrestore(&bank->lock, flags); return -EINVAL; } @@ -976,12 +976,10 @@ static int omap_gpio_input(struct gpio_chip *chip, unsigned offset) static int omap_gpio_get(struct gpio_chip *chip, unsigned offset) { struct gpio_bank *bank; - u32 mask; bank = container_of(chip, struct gpio_bank, chip); - mask = (BIT(offset)); - if (omap_gpio_is_input(bank, mask)) + if (omap_gpio_is_input(bank, offset)) return omap_get_gpio_datain(bank, offset); else return omap_get_gpio_dataout(bank, offset);