diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-10 12:05:49 +0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-09-06 18:37:58 +0400 |
| commit | aa9d842c5f2da6cdef2777f2f062f61898be89d3 (patch) | |
| tree | 1f03f31fe41484b40e8a8f8cd17f7552463ef2ad /drivers/mfd/wm8350-gpio.c | |
| parent | 8efcc57dedfebc99c3cd39564e3fc47cd1a24b75 (diff) | |
| download | linux-aa9d842c5f2da6cdef2777f2f062f61898be89d3.tar.xz | |
mfd: Rename wm8350 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 <s.hauer@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/wm8350-gpio.c')
| -rw-r--r-- | 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 ebf99bef392f..d584f6b4d6e2 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; |