Skip to content

Commit

Permalink
ARM: 5745/1: Change ep93xx gpio_irq static inlines to macros
Browse files Browse the repository at this point in the history
From: Ryan Mallon <ryan@bluewatersys.com>

Change the gpio_to_irq and irq_to_gpio static inline functions to
macros so that they can be used in variable initialisers.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Hartley Sweeten authored and Russell King committed Oct 7, 2009
1 parent 1f8db4f commit cc1ad4a
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions arch/arm/mach-ep93xx/include/mach/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,9 @@ extern void ep93xx_gpio_int_debounce(unsigned int irq, int enable);
* B0..B7 (7..15) to irq 72..79, and
* F0..F7 (16..24) to irq 80..87.
*/
static inline int gpio_to_irq(unsigned gpio)
{
if (gpio <= EP93XX_GPIO_LINE_MAX_IRQ)
return 64 + gpio;

return -EINVAL;
}

static inline int irq_to_gpio(unsigned irq)
{
return irq - gpio_to_irq(0);
}
#define gpio_to_irq(gpio) \
(((gpio) <= EP93XX_GPIO_LINE_MAX_IRQ) ? (64 + (gpio)) : -EINVAL)

#define irq_to_gpio(irq) ((irq) - gpio_to_irq(0))

#endif

0 comments on commit cc1ad4a

Please sign in to comment.