1 files changed, 6 insertions, 41 deletions

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 7dd50a43fbcf..c233ebd7639a 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -221,51 +221,35 @@ static int gpio_bank_count;
 
 static inline struct gpio_bank *get_gpio_bank(int gpio)
 {
-#ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap15xx()) {
                 if (OMAP_GPIO_IS_MPUIO(gpio))
                         return &gpio_bank[0];
                 return &gpio_bank[1];
         }
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
         if (cpu_is_omap16xx()) {
                 if (OMAP_GPIO_IS_MPUIO(gpio))
                         return &gpio_bank[0];
                 return &gpio_bank[1 + (gpio >> 4)];
         }
-#endif
-#ifdef CONFIG_ARCH_OMAP730
         if (cpu_is_omap730()) {
                 if (OMAP_GPIO_IS_MPUIO(gpio))
                         return &gpio_bank[0];
                 return &gpio_bank[1 + (gpio >> 5)];
         }
-#endif
-#ifdef CONFIG_ARCH_OMAP24XX
         if (cpu_is_omap24xx())
                 return &gpio_bank[gpio >> 5];
-#endif
-#ifdef CONFIG_ARCH_OMAP34XX
         if (cpu_is_omap34xx())
                 return &gpio_bank[gpio >> 5];
-#endif
 }
 
 static inline int get_gpio_index(int gpio)
 {
-#ifdef CONFIG_ARCH_OMAP730
         if (cpu_is_omap730())
                 return gpio & 0x1f;
-#endif
-#ifdef CONFIG_ARCH_OMAP24XX
         if (cpu_is_omap24xx())
                 return gpio & 0x1f;
-#endif
-#ifdef CONFIG_ARCH_OMAP34XX
         if (cpu_is_omap34xx())
                 return gpio & 0x1f;
-#endif
         return gpio & 0x0f;
 }
 
@@ -273,33 +257,21 @@ static inline int gpio_valid(int gpio)
 {
         if (gpio < 0)
                 return -1;
-#ifndef CONFIG_ARCH_OMAP24XX
-        if (OMAP_GPIO_IS_MPUIO(gpio)) {
+        if (cpu_class_is_omap1() && OMAP_GPIO_IS_MPUIO(gpio)) {
                 if (gpio >= OMAP_MAX_GPIO_LINES + 16)
                         return -1;
                 return 0;
         }
-#endif
-#ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap15xx() && gpio < 16)
                 return 0;
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
         if ((cpu_is_omap16xx()) && gpio < 64)
                 return 0;
-#endif
-#ifdef CONFIG_ARCH_OMAP730
         if (cpu_is_omap730() && gpio < 192)
                 return 0;
-#endif
-#ifdef CONFIG_ARCH_OMAP24XX
         if (cpu_is_omap24xx() && gpio < 128)
                 return 0;
-#endif
-#ifdef CONFIG_ARCH_OMAP34XX
         if (cpu_is_omap34xx() && gpio < 160)
                 return 0;
-#endif
         return -1;
 }
 
@@ -1393,27 +1365,22 @@ static int __init _omap_gpio_init(void)
                 spin_lock_init(&bank->lock);
                 if (bank_is_mpuio(bank))
                         omap_writew(0xFFFF, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_MASKIT);
-#ifdef CONFIG_ARCH_OMAP15XX
-                if (bank->method == METHOD_GPIO_1510) {
+                if (cpu_is_omap15xx() && bank->method == METHOD_GPIO_1510) {
                         __raw_writew(0xffff, bank->base + OMAP1510_GPIO_INT_MASK);
                         __raw_writew(0x0000, bank->base + OMAP1510_GPIO_INT_STATUS);
                 }
-#endif
-#if defined(CONFIG_ARCH_OMAP16XX)
-                if (bank->method == METHOD_GPIO_1610) {
+                if (cpu_is_omap16xx() && bank->method == METHOD_GPIO_1610) {
                         __raw_writew(0x0000, bank->base + OMAP1610_GPIO_IRQENABLE1);
                         __raw_writew(0xffff, bank->base + OMAP1610_GPIO_IRQSTATUS1);
                         __raw_writew(0x0014, bank->base + OMAP1610_GPIO_SYSCONFIG);
                 }
-#endif
-#ifdef CONFIG_ARCH_OMAP730
-                if (bank->method == METHOD_GPIO_730) {
+                if (cpu_is_omap730() && bank->method == METHOD_GPIO_730) {
                         __raw_writel(0xffffffff, bank->base + OMAP730_GPIO_INT_MASK);
                         __raw_writel(0x00000000, bank->base + OMAP730_GPIO_INT_STATUS);
 
                         gpio_count = 32; /* 730 has 32-bit GPIOs */
                 }
-#endif
+
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
                 if (bank->method == METHOD_GPIO_24XX) {
                         static const u32 non_wakeup_gpios[] = {
@@ -1450,14 +1417,12 @@ static int __init _omap_gpio_init(void)
         if (cpu_is_omap16xx())
                 omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04, ULPD_CAM_CLK_CTRL);
 
-#if defined(CONFIG_ARCH_OMAP24XX)
         /* Enable autoidle for the OCP interface */
         if (cpu_is_omap24xx())
                 omap_writel(1 << 0, 0x48019010);
-#elif defined(CONFIG_ARCH_OMAP34XX)
         if (cpu_is_omap34xx())
                 omap_writel(1 << 0, 0x48306814);
-#endif
+
         return 0;
 }