diff --git a/[refs] b/[refs] index 07807e7e29e2..a6fe92f4671c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8194c7c4d5ea14d819bb2eab6a23b07331b734d8 +refs/heads/master: c77c8a6fd3d57b586ff5ecb5ab5b32ca4f54fe75 diff --git a/trunk/drivers/gpio/gpio-ep93xx.c b/trunk/drivers/gpio/gpio-ep93xx.c index 1c0fc3756cb1..6a89683fdc91 100644 --- a/trunk/drivers/gpio/gpio-ep93xx.c +++ b/trunk/drivers/gpio/gpio-ep93xx.c @@ -12,8 +12,6 @@ * published by the Free Software Foundation. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include #include #include @@ -65,11 +63,6 @@ static void ep93xx_gpio_update_int_params(unsigned port) EP93XX_GPIO_REG(int_en_register_offset[port])); } -static inline void ep93xx_gpio_int_mask(unsigned line) -{ - gpio_int_unmasked[line >> 3] &= ~(1 << (line & 7)); -} - static void ep93xx_gpio_int_debounce(unsigned int irq, bool enable) { int line = irq_to_gpio(irq); @@ -212,7 +205,6 @@ static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type) handler = handle_edge_irq; break; default: - pr_err("failed to set irq type %d for gpio %d\n", type, gpio); return -EINVAL; }