From patchwork Thu Mar 19 17:25:42 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: 46066 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50C372153C for ; Thu, 19 Mar 2015 17:26:31 +0000 (UTC) Received: by lams18 with SMTP id s18sf13752235lam.2 for ; Thu, 19 Mar 2015 10:26:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=aKZKAya/0wnUlXpjw4rQRBLSkPzGVPvG2zjyIS8h4Vo=; b=Y9hX4/A6MayOodKXROC9sdimhot8fNHn/zI00TpXi0ebCP7AV8qip5/3PyWPyehnKX 3/A7IeCcgOlJYwyX6azG5R/meH+t7FcLGTF1khg2Gekb6emNIu19wsASbrNZyH9IB7dX Zd7qwEA0k4nHfwa7yTx3SUPHoiM8saTioZHyUEd4QAYQpzWrQU1RnlwxKUAZQFJeo700 3Nl3FV+VYiIJhvQpefTdCGCSy+4kGC/ETcHjpuzPO30NEYRZne8PgsP5kqg0JSxYNJCw ufOJzFaxYX4WU4NUUeu9Js9Gbbanv/X5felTFMfDa4uusQlAknUn2CyJJWG7epfWWW0Y n5QA== X-Gm-Message-State: ALoCoQmnWgibyfi1BeCQLCy+l5Jwv64NjJlKyQOK83vtBfsrq2vj720oP7/n0O1LATHBMapNEgOb X-Received: by 10.152.27.134 with SMTP id t6mr12287792lag.5.1426785989857; Thu, 19 Mar 2015 10:26:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.69 with SMTP id kw5ls297791lac.86.gmail; Thu, 19 Mar 2015 10:26:29 -0700 (PDT) X-Received: by 10.112.78.37 with SMTP id y5mr68218821lbw.91.1426785989648; Thu, 19 Mar 2015 10:26:29 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id b8si734371lae.45.2015.03.19.10.26.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2015 10:26:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbsy1 with SMTP id sy1so58052873lbb.1 for ; Thu, 19 Mar 2015 10:26:29 -0700 (PDT) X-Received: by 10.112.204.197 with SMTP id la5mr68884752lbc.29.1426785989561; Thu, 19 Mar 2015 10:26:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp533257lbj; Thu, 19 Mar 2015 10:26:28 -0700 (PDT) X-Received: by 10.66.66.75 with SMTP id d11mr175654070pat.132.1426785987794; Thu, 19 Mar 2015 10:26:27 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fb7si4141229pdb.132.2015.03.19.10.26.26; Thu, 19 Mar 2015 10:26:27 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757442AbbCSR0L (ORCPT + 27 others); Thu, 19 Mar 2015 13:26:11 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:35205 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757405AbbCSR0E (ORCPT ); Thu, 19 Mar 2015 13:26:04 -0400 Received: by lbcgn8 with SMTP id gn8so57937217lbc.2 for ; Thu, 19 Mar 2015 10:26:02 -0700 (PDT) X-Received: by 10.112.78.37 with SMTP id y5mr68217231lbw.91.1426785962554; Thu, 19 Mar 2015 10:26:02 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id an8sm404571lbc.45.2015.03.19.10.26.01 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 19 Mar 2015 10:26:02 -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 6/8] gpio: omap: get rid of GPIO_BIT() macro Date: Thu, 19 Mar 2015 19:25:42 +0200 Message-Id: <1426785944-17255-7-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426785944-17255-1-git-send-email-grygorii.strashko@linaro.org> References: <1426785944-17255-1-git-send-email-grygorii.strashko@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: grygorii.strashko@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Grygorii Strashko Now OMAP GPIO driver prepared for GPIO_BIT() macro removing. Do it ;) Signed-off-by: Grygorii Strashko --- drivers/gpio/gpio-omap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index b39faa8..dd7934a 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -82,7 +82,6 @@ struct gpio_bank { }; #define GPIO_INDEX(bank, gpio) (gpio % bank->width) -#define GPIO_BIT(bank, gpio) (BIT(GPIO_INDEX(bank, gpio))) #define GPIO_MOD_CTRL_BIT BIT(0) #define BANK_USED(bank) (bank->mod_usage || bank->irq_usage) @@ -863,7 +862,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d) { struct gpio_bank *bank = omap_irq_data_get_bank(d); unsigned offset = d->hwirq; - unsigned int irq_mask = GPIO_BIT(bank, gpio); u32 trigger = irqd_get_trigger_type(d); unsigned long flags; @@ -873,7 +871,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d) /* For level-triggered GPIOs, the clearing must be done after * the HW source is cleared, thus after the handler has run */ - if (bank->level_mask & irq_mask) { + if (bank->level_mask & BIT(offset)) { omap_set_gpio_irqenable(bank, offset, 0); omap_clear_gpio_irqstatus(bank, offset); }