lkml.org 
[lkml]   [2011]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] mfd wm8350: rename static gpio_set_debounce()
    Hello,

    [extended the audience a bit]

    On Wed, Aug 10, 2011 at 10:05:49AM +0200, Sascha Hauer wrote:
    >
    > The kernel already has a function with this name declared
    > in asm-generic/gpio.h. So if this header leaks into wm8350/gpio.c
    > we get
    note the "if" is real on arm/imx since

    14305e6 (ARM: mxc: use ARCH_NR_GPIOS to define gpio number)

    That commit adds an #include <asm-generic/gpio.h> to
    arch/arm/plat-mxc/include/mach/irqs.h and so you get the gpio stuff when
    #including <linux/interrupt.h> (via linux/interrupt.h -> linux/irqnr.h
    -> asm/irq.h -> mach/irqs.h).
    I think this is a bit unfortunate, but I havn't looked if it could be
    prevented somehow.

    > drivers/mfd/wm8350-gpio.c:40:12: error: conflicting types for 'gpio_set_debounce'
    > include/asm-generic/gpio.h:156:12: note: previous declaration of 'gpio_set_debounce' was here
    >
    > Fix this by adding a wm8350_ prefix to the function.
    Nevertheless Sascha's patch is OK as gpio_set_debounce is a too generic
    name for a function in an mfd driver. That said I think the other
    functions should get the same fix.

    Best regards
    Uwe

    > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
    > ---
    >
    > This is the minimal solution to this problem. It would be more
    > consistent though not required to add a wm8350_ prefix to the
    > other functions in this file aswell. Let me know what you prefer.
    >
    > drivers/mfd/wm8350-gpio.c | 4 ++--
    > 1 files changed, 2 insertions(+), 2 deletions(-)
    >
    > diff --git a/drivers/mfd/wm8350-gpio.c b/drivers/mfd/wm8350-gpio.c
    > index ebf99be..d584f6b 100644
    > --- a/drivers/mfd/wm8350-gpio.c
    > +++ b/drivers/mfd/wm8350-gpio.c
    > @@ -37,7 +37,7 @@ static int gpio_set_dir(struct wm8350 *wm8350, int gpio, int dir)
    > return ret;
    > }
    >
    > -static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)
    > +static int wm8350_gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db)
    > {
    > if (db == WM8350_GPIO_DEBOUNCE_ON)
    > return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE,
    > @@ -210,7 +210,7 @@ int wm8350_gpio_config(struct wm8350 *wm8350, int gpio, int dir, int func,
    > goto err;
    > if (gpio_set_polarity(wm8350, gpio, pol))
    > goto err;
    > - if (gpio_set_debounce(wm8350, gpio, debounce))
    > + if (wm8350_gpio_set_debounce(wm8350, gpio, debounce))
    > goto err;
    > if (gpio_set_dir(wm8350, gpio, dir))
    > goto err;
    > --
    > 1.7.5.4
    >
    > --
    > Pengutronix e.K. | |
    > Industrial Linux Solutions | http://www.pengutronix.de/ |
    > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
    > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at http://www.tux.org/lkml/
    >
    >
    >

    --
    Pengutronix e.K. | Uwe Kleine-König |
    Industrial Linux Solutions | http://www.pengutronix.de/ |
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-08-15 08:37    [W:0.029 / U:149.776 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site