Browse Source

SA1100: make gpio_to_irq and reverse a macro

The function can't be used for static initialisations so
convert them to macros.
Thomas Kunze 16 năm trước cách đây
mục cha
commit
cc64717279
1 tập tin đã thay đổi với 4 bổ sung15 xóa
  1. 4 15
      arch/arm/mach-sa1100/include/mach/gpio.h

+ 4 - 15
arch/arm/mach-sa1100/include/mach/gpio.h

@@ -49,20 +49,9 @@ static inline void gpio_set_value(unsigned gpio, int value)
 
 #define gpio_cansleep	__gpio_cansleep
 
-static inline unsigned gpio_to_irq(unsigned gpio)
-{
-	if (gpio < 11)
-		return IRQ_GPIO0 + gpio;
-	else
-		return IRQ_GPIO11 - 11 + gpio;
-}
-
-static inline unsigned irq_to_gpio(unsigned irq)
-{
-	if (irq < IRQ_GPIO11_27)
-		return irq - IRQ_GPIO0;
-	else
-		return irq - IRQ_GPIO11 + 11;
-}
+#define gpio_to_irq(gpio)	((gpio < 11) ? (IRQ_GPIO0 + gpio) : \
+					(IRQ_GPIO11 - 11 + gpio))
+#define irq_to_gpio(irq)	((irq < IRQ_GPIO11_27) ? (irq - IRQ_GPIO0) : \
+					(irq - IRQ_GPIO11 + 11))
 
 #endif