Commit 638f958b authored May 05, 2015 by Geert Uytterhoeven Committed by Chanwoo Choi May 19, 2015

extcon: Allow compile test of GPIO consumers if !GPIOLIB

The GPIO subsystem provides dummy GPIO consumer functions if GPIOLIB is
not enabled. Hence drivers that depend on GPIOLIB, but use GPIO consumer
functionality only, can still be compiled if GPIOLIB is not enabled.

Relax the dependency on GPIOLIB if COMPILE_TEST is enabled, where
appropriate.

If GPIOLIB=n and asm-generic/gpio.h is not used:

drivers/extcon/extcon-usb-gpio.c: In function ‘usb_extcon_detect_cable’:
drivers/extcon/extcon-usb-gpio.c:63: error: implicit declaration of function ‘gpiod_get_value_cansleep’
drivers/extcon/extcon-usb-gpio.c: In function ‘usb_extcon_probe’:
drivers/extcon/extcon-usb-gpio.c:116: error: implicit declaration of function ‘devm_gpiod_get’
drivers/extcon/extcon-usb-gpio.c:116: warning: assignment makes pointer from integer without a cast
drivers/extcon/extcon-usb-gpio.c:122: error: implicit declaration of function ‘gpiod_set_debounce’
drivers/extcon/extcon-usb-gpio.c:129: error: implicit declaration of function ‘gpiod_to_irq’

Add the missing #include <linux/gpio/consumer.h> to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

parent c571bbb4

drivers/extcon/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ config EXTCON_AXP288

		config EXTCON_GPIO
		tristate "GPIO extcon support"
		depends on GPIOLIB
		depends on GPIOLIB \|\| COMPILE_TEST
		help
		Say Y here to enable GPIO based extcon support. Note that GPIO
		extcon supports single state per extcon instance.
		@@ -112,7 +112,7 @@ config EXTCON_SM5502

		config EXTCON_USB_GPIO
		tristate "USB GPIO extcon support"
		depends on GPIOLIB
		depends on GPIOLIB \|\| COMPILE_TEST
		help
		Say Y here to enable GPIO based USB cable detection extcon support.
		Used typically if GPIO is used for USB ID pin detection.

drivers/extcon/extcon-usb-gpio.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		#include <linux/extcon.h>
		#include <linux/gpio/consumer.h>
		#include <linux/init.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>

Admin message