Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sascha Hauer and committed by
Samuel Ortiz
aa9d842c 8efcc57d

+2 -2
+2 -2
drivers/mfd/wm8350-gpio.c
··· 37 37 return ret; 38 38 } 39 39 40 - static int gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db) 40 + static int wm8350_gpio_set_debounce(struct wm8350 *wm8350, int gpio, int db) 41 41 { 42 42 if (db == WM8350_GPIO_DEBOUNCE_ON) 43 43 return wm8350_set_bits(wm8350, WM8350_GPIO_DEBOUNCE, ··· 210 210 goto err; 211 211 if (gpio_set_polarity(wm8350, gpio, pol)) 212 212 goto err; 213 - if (gpio_set_debounce(wm8350, gpio, debounce)) 213 + if (wm8350_gpio_set_debounce(wm8350, gpio, debounce)) 214 214 goto err; 215 215 if (gpio_set_dir(wm8350, gpio, dir)) 216 216 goto err;