From patchwork Mon Jun 6 06:20:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1750 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:21 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs12120vdc; Sun, 5 Jun 2011 23:12:58 -0700 (PDT) Received: by 10.42.156.5 with SMTP id x5mr4214717icw.476.1307340777847; Sun, 05 Jun 2011 23:12:57 -0700 (PDT) Received: from mail-px0-f172.google.com (mail-px0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id i6si27479254icv.133.2011.06.05.23.12.56 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Jun 2011 23:12:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by pxi6 with SMTP id 6so2296433pxi.17 for ; Sun, 05 Jun 2011 23:12:55 -0700 (PDT) Received: by 10.142.62.29 with SMTP id k29mr629524wfa.397.1307340774888; Sun, 05 Jun 2011 23:12:54 -0700 (PDT) Received: from localhost.localdomain ([114.216.154.92]) by mx.google.com with ESMTPS id y2sm3447688pbi.67.2011.06.05.23.12.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Jun 2011 23:12:54 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: grant.likely@secretlab.ca, jamie@jamieiles.com, kernel@pengutronix.de, patches@linaro.org, Shawn Guo Subject: [PATCH 1/2] gpio/mxs: save the unnecessary function mxs_gpio_to_irq Date: Mon, 6 Jun 2011 14:20:46 +0800 Message-Id: <1307341247-26382-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 The irq number can be easily calculated from the sum of MXS_GPIO_IRQ_START and gpio number. The patch directly defines gpio_to_irq for it and removes mxs_gpio_to_irq to simplify the the driver. Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/include/mach/gpio.h | 2 +- drivers/gpio/gpio-mxs.c | 9 --------- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h index 828cccc..18017c5 100644 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h @@ -28,8 +28,8 @@ #define gpio_get_value __gpio_get_value #define gpio_set_value __gpio_set_value #define gpio_cansleep __gpio_cansleep -#define gpio_to_irq __gpio_to_irq #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) +#define gpio_to_irq(gpio) (MXS_GPIO_IRQ_START + (gpio)) #endif /* __MACH_MXS_GPIO_H__ */ diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c index a287614..d01f046 100644 --- a/drivers/gpio/gpio-mxs.c +++ b/drivers/gpio/gpio-mxs.c @@ -236,14 +236,6 @@ static void mxs_gpio_set(struct gpio_chip *chip, unsigned offset, int value) writel(1 << offset, pin_addr + MXS_CLR); } -static int mxs_gpio_to_irq(struct gpio_chip *chip, unsigned offset) -{ - struct mxs_gpio_port *port = - container_of(chip, struct mxs_gpio_port, chip); - - return port->virtual_irq_start + offset; -} - static int mxs_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { mxs_set_gpio_direction(chip, offset, 0); @@ -327,7 +319,6 @@ static int __devinit mxs_gpio_probe(struct platform_device *pdev) port->chip.direction_output = mxs_gpio_direction_output; port->chip.get = mxs_gpio_get; port->chip.set = mxs_gpio_set; - port->chip.to_irq = mxs_gpio_to_irq; port->chip.base = port->id * 32; port->chip.ngpio = 32;