gpio/omap: remove bank->method & METHOD_* macros

The only bank->type (method) used in the OMAP GPIO driver is MPUIO type as they
need to be handled separately. Identify the same using a flag and remove all
METHOD_* macros.

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.

Signed-off-by: Charulatha V <charu@ti.com>
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 6 insertions, 32 deletions

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 38beccc9e655..951d78435812 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -49,7 +49,6 @@ struct gpio_bank {
         void __iomem *base;
         u16 irq;
         u16 virtual_irq_start;
-        int method;
         u32 suspend_wakeup;
         u32 saved_wakeup;
         u32 non_wakeup_gpios;
@@ -66,6 +65,7 @@ struct gpio_bank {
         u32 mod_usage;
         u32 dbck_enable_mask;
         struct device *dev;
+        bool is_mpuio;
         bool dbck_flag;
         bool loses_context;
         int stride;
@@ -693,14 +693,6 @@ 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);
@@ -762,23 +754,8 @@ 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
- * don't switch on METHOD_* and which mostly avoid spinlocks
- */
-
 static int gpio_input(struct gpio_chip *chip, unsigned offset)
 {
         struct gpio_bank *bank;
@@ -899,7 +876,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
         if (bank->width == 16)
                 l = 0xffff;
 
-        if (bank_is_mpuio(bank)) {
+        if (bank->is_mpuio) {
                 __raw_writel(l, bank->base + bank->regs->irqenable);
                 return;
         }
@@ -951,7 +928,6 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
         int j;
         static int gpio;
 
-        bank->mod_usage = 0;
         /*
          * REVISIT eventually switch from OMAP-specific gpio structs
          * over to the generic ones
@@ -964,12 +940,10 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
         bank->chip.set_debounce = gpio_debounce;
         bank->chip.set = gpio_set;
         bank->chip.to_irq = gpio_2irq;
-        if (bank_is_mpuio(bank)) {
+        if (bank->is_mpuio) {
                 bank->chip.label = "mpuio";
-#ifdef CONFIG_ARCH_OMAP16XX
                 if (bank->regs->wkup_en)
                         bank->chip.dev = &omap_mpuio_device.dev;
-#endif
                 bank->chip.base = OMAP_MPUIO(0);
         } else {
                 bank->chip.label = "gpio";
@@ -984,7 +958,7 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
                      j < bank->virtual_irq_start + bank->width; j++) {
                 irq_set_lockdep_class(j, &gpio_lock_class);
                 irq_set_chip_data(j, bank);
-                if (bank_is_mpuio(bank)) {
+                if (bank->is_mpuio) {
                         omap_mpuio_alloc_gc(bank, j, bank->width);
                 } else {
                         irq_set_chip(j, &gpio_irq_chip);
@@ -1028,11 +1002,11 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
 
         pdata = pdev->dev.platform_data;
         bank->virtual_irq_start = pdata->virtual_irq_start;
-        bank->method = pdata->bank_type;
         bank->dev = &pdev->dev;
         bank->dbck_flag = pdata->dbck_flag;
         bank->stride = pdata->bank_stride;
         bank->width = pdata->bank_width;
+        bank->is_mpuio = pdata->is_mpuio;
         bank->non_wakeup_gpios = pdata->non_wakeup_gpios;
         bank->loses_context = pdata->loses_context;
         bank->get_context_loss_count = pdata->get_context_loss_count;
@@ -1065,7 +1039,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
         pm_runtime_enable(bank->dev);
         pm_runtime_get_sync(bank->dev);
 
-        if (bank_is_mpuio(bank))
+        if (bank->is_mpuio)
                 mpuio_init(bank);
 
         omap_gpio_mod_init(bank);