From: Tarun Kanti DebBarma <tarun.kanti@ti.com> To: linux-omap@vger.kernel.org Cc: khilman@ti.com, santosh.shilimkar@ti.com, tony@atomide.com, linux-arm-kernel@lists.infradead.org, Charulatha V <charu@ti.com> Subject: [PATCH v4 REPOST 09/20] gpio/omap: cleanup omap1 related macros Date: Sat, 16 Jul 2011 13:45:41 +0530 [thread overview] Message-ID: <1310804152-9243-10-git-send-email-tarun.kanti@ti.com> (raw) In-Reply-To: <1310804152-9243-1-git-send-email-tarun.kanti@ti.com> From: Charulatha V <charu@ti.com> mpuio_init() function is defined under #ifdefs. It is required only in case of MPUIO bank type and only when PM operations are supported by it. This is applicable only in case of OMAP16xx SoC's MPUIO GPIO bank type. For all the other cases it is a dummy function. Hence clean up the same and remove all the OMAP SoC specific #ifdefs. bank_is_mpuio() is defined as a check to identify if the bank type is MPUIO. It is not required to define it separately as zero for OMAP2PLUS. Remove this. Signed-off-by: Charulatha V <charu@ti.com> --- drivers/gpio/gpio-omap.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index c9d12c5..fe02e7a 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -777,14 +777,8 @@ static struct irq_chip gpio_irq_chip = { /*---------------------------------------------------------------------*/ -#ifdef CONFIG_ARCH_OMAP1 - #define bank_is_mpuio(bank) ((bank)->method == METHOD_MPUIO) -#ifdef CONFIG_ARCH_OMAP16XX - -#include <linux/platform_device.h> - static int omap_mpuio_suspend_noirq(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -846,17 +840,6 @@ static inline void mpuio_init(struct gpio_bank *bank) (void) platform_device_register(&omap_mpuio_device); } -#else -static inline void mpuio_init(struct gpio_bank *bank) {} -#endif /* 16xx */ - -#else - -#define bank_is_mpuio(bank) 0 -static inline void mpuio_init(struct gpio_bank *bank) {} - -#endif - /*---------------------------------------------------------------------*/ /* REVISIT these are stupid implementations! replace by ones that @@ -1077,10 +1060,8 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) bank->chip.to_irq = gpio_2irq; if (bank_is_mpuio(bank)) { bank->chip.label = "mpuio"; -#ifdef CONFIG_ARCH_OMAP16XX if (bank->regs->wkup_status) bank->chip.dev = &omap_mpuio_device.dev; -#endif bank->chip.base = OMAP_MPUIO(0); } else { bank->chip.label = "gpio"; -- 1.6.0.4
WARNING: multiple messages have this Message-ID (diff)
From: tarun.kanti@ti.com (Tarun Kanti DebBarma) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 REPOST 09/20] gpio/omap: cleanup omap1 related macros Date: Sat, 16 Jul 2011 13:45:41 +0530 [thread overview] Message-ID: <1310804152-9243-10-git-send-email-tarun.kanti@ti.com> (raw) In-Reply-To: <1310804152-9243-1-git-send-email-tarun.kanti@ti.com> From: Charulatha V <charu@ti.com> mpuio_init() function is defined under #ifdefs. It is required only in case of MPUIO bank type and only when PM operations are supported by it. This is applicable only in case of OMAP16xx SoC's MPUIO GPIO bank type. For all the other cases it is a dummy function. Hence clean up the same and remove all the OMAP SoC specific #ifdefs. bank_is_mpuio() is defined as a check to identify if the bank type is MPUIO. It is not required to define it separately as zero for OMAP2PLUS. Remove this. Signed-off-by: Charulatha V <charu@ti.com> --- drivers/gpio/gpio-omap.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index c9d12c5..fe02e7a 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -777,14 +777,8 @@ static struct irq_chip gpio_irq_chip = { /*---------------------------------------------------------------------*/ -#ifdef CONFIG_ARCH_OMAP1 - #define bank_is_mpuio(bank) ((bank)->method == METHOD_MPUIO) -#ifdef CONFIG_ARCH_OMAP16XX - -#include <linux/platform_device.h> - static int omap_mpuio_suspend_noirq(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -846,17 +840,6 @@ static inline void mpuio_init(struct gpio_bank *bank) (void) platform_device_register(&omap_mpuio_device); } -#else -static inline void mpuio_init(struct gpio_bank *bank) {} -#endif /* 16xx */ - -#else - -#define bank_is_mpuio(bank) 0 -static inline void mpuio_init(struct gpio_bank *bank) {} - -#endif - /*---------------------------------------------------------------------*/ /* REVISIT these are stupid implementations! replace by ones that @@ -1077,10 +1060,8 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) bank->chip.to_irq = gpio_2irq; if (bank_is_mpuio(bank)) { bank->chip.label = "mpuio"; -#ifdef CONFIG_ARCH_OMAP16XX if (bank->regs->wkup_status) bank->chip.dev = &omap_mpuio_device.dev; -#endif bank->chip.base = OMAP_MPUIO(0); } else { bank->chip.label = "gpio"; -- 1.6.0.4
next prev parent reply other threads:[~2011-07-16 8:16 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-16 8:15 [PATCH v4 REPOST 00/20] gpio/omap: driver cleanup and fixes Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 01/20] gpio/omap: remove dependency on gpio_bank_count Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 02/20] gpio/omap: use flag to identify wakeup domain Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 03/20] gpio/omap: make gpio_context part of gpio_bank structure Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 04/20] gpio/omap: fix pwrdm_post_transition call sequence Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 05/20] gpio/omap: handle save/restore ctx in GPIO driver Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 06/20] gpio/omap: make non-wakeup GPIO part of pdata Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 07/20] gpio/omap: avoid cpu checks during module ena/disable Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 08/20] gpio/omap: further cleanup using wakeup_status register Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma [this message] 2011-07-16 8:15 ` [PATCH v4 REPOST 09/20] gpio/omap: cleanup omap1 related macros Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 10/20] gpio/omap: use level/edge detect reg offsets Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 11/20] gpio/omap: remove hardcoded offsets in ctxt save/restore Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 12/20] gpio/omap: cleanup set_gpio_triggering function Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 13/20] gpio/omap: cleanup omap_gpio_mod_init function Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 18:26 ` Todd Poynor 2011-07-16 18:26 ` Todd Poynor 2011-07-20 7:07 ` DebBarma, Tarun Kanti 2011-07-20 7:07 ` DebBarma, Tarun Kanti 2011-07-16 8:15 ` [PATCH v4 REPOST 14/20] gpio/omap: use pinctrl offset instead of macro Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 15/20] gpio/omap: use readl in irq_handler for all access Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 16/20] gpio/omap: remove bank->method & METHOD_* macros Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 17/20] gpio/omap: fix bankwidth for OMAP7xx MPUIO Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 18/20] gpio/omap: use pm-runtime framework Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 19:07 ` Todd Poynor 2011-07-16 19:07 ` Todd Poynor 2011-07-20 10:08 ` DebBarma, Tarun Kanti 2011-07-20 10:08 ` DebBarma, Tarun Kanti 2011-07-27 11:44 ` DebBarma, Tarun Kanti 2011-07-27 11:44 ` DebBarma, Tarun Kanti 2011-07-28 7:43 ` Todd Poynor 2011-07-28 7:43 ` Todd Poynor 2011-07-28 9:35 ` DebBarma, Tarun Kanti 2011-07-28 9:35 ` DebBarma, Tarun Kanti 2011-07-28 17:00 ` Todd Poynor 2011-07-28 17:00 ` Todd Poynor 2011-07-29 10:45 ` DebBarma, Tarun Kanti 2011-07-29 10:45 ` DebBarma, Tarun Kanti 2011-07-29 10:55 ` DebBarma, Tarun Kanti 2011-07-29 10:55 ` DebBarma, Tarun Kanti 2011-07-16 8:15 ` [PATCH v4 REPOST 19/20] gpio/omap: optimize suspend and resume functions Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma 2011-07-16 8:15 ` [PATCH v4 REPOST 20/20] gpio/omap: cleanup prepare_for_idle and resume_after_idle Tarun Kanti DebBarma 2011-07-16 8:15 ` Tarun Kanti DebBarma
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=1310804152-9243-10-git-send-email-tarun.kanti@ti.com \ --to=tarun.kanti@ti.com \ --cc=charu@ti.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=santosh.shilimkar@ti.com \ --cc=tony@atomide.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.