Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa9d842c authored by Sascha Hauer's avatar Sascha Hauer Committed by Samuel Ortiz
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8efcc57d

drivers/mfd/wm8350-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -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;