From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/8] gpio/mxs: move irq_to_gpio() into gpio-mxs driver
Date: Sun, 14 Aug 2011 00:14:06 +0800 [thread overview]
Message-ID: <1313252047-8820-8-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1313252047-8820-1-git-send-email-shawn.guo@linaro.org>
As irq_to_gpio() is only being used by gpio-mxs driver, it should be
moved from mach/gpio.h into gpio-mxs.c.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-mxs/include/mach/gpio.h | 2 --
drivers/gpio/gpio-mxs.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
index bb11e63..8aea2ec 100644
--- a/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@ -22,6 +22,4 @@
#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
-#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
-
#endif /* __MACH_MXS_GPIO_H__ */
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index af55a85..292b504 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -49,6 +49,8 @@
#define GPIO_INT_LEV_MASK (1 << 0)
#define GPIO_INT_POL_MASK (1 << 1)
+#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START)
+
struct mxs_gpio_port {
void __iomem *base;
int id;
--
1.7.4.1
next prev parent reply other threads:[~2011-08-13 16:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-13 16:13 [PATCH v2 0/8] Clean up MXC and MXS mach/gpio.h Shawn Guo
2011-08-13 16:14 ` [PATCH v2 1/8] ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage Shawn Guo
2011-08-13 16:14 ` [PATCH v2 2/8] arm/mxc: do not use gpio_to_irq() for static initializers Shawn Guo
2011-08-13 16:14 ` [PATCH v2 3/8] gpio/mxc: add .to_irq for gpio chip Shawn Guo
2011-08-13 16:14 ` [PATCH v2 4/8] arm/mxc: remove gpio_to_irq() from mach/gpio.h Shawn Guo
2011-08-13 16:14 ` [PATCH v2 5/8] gpio/mxc: move irq_to_gpio() into gpio-mxc driver Shawn Guo
2011-08-13 16:14 ` [PATCH v2 6/8] arm/mxc: move IMX_GPIO_NR into mach/hardware.h Shawn Guo
2011-08-13 16:14 ` Shawn Guo [this message]
2011-08-13 16:14 ` [PATCH v2 8/8] arm/mxs: move MXS_GPIO_NR into mach/mxs.h Shawn Guo
2011-08-16 7:19 ` [PATCH v2 0/8] Clean up MXC and MXS mach/gpio.h Sascha Hauer
2011-08-17 6:25 ` Shawn Guo
2011-08-17 6:47 ` Sascha Hauer
2011-08-17 7:10 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313252047-8820-8-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).