[lkml]   [2011]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH] mfd wm8350: rename static gpio_set_debounce()

    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

    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.

    Signed-off-by: Sascha Hauer <>

    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;
    Pengutronix e.K. | |
    Industrial Linux Solutions | |
    Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
    Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

     \ /
      Last update: 2011-08-10 10:09    [W:0.022 / U:50.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site