[01/27] drm/bridge: ptn3460: #include <linux/gpio/consumer.h>, depend on GPIOLIB
diff mbox series

Message ID 1430843563-18615-1-git-send-email-geert@linux-m68k.org
State New, archived
Headers show
Series
  • gpio: Allow compile test of GPIO consumers if !GPIOLIB
Related show

Commit Message

Geert Uytterhoeven May 5, 2015, 4:32 p.m. UTC
If GPIOLIB=n and asm-generic/gpio.h is not used:

    drivers/gpu/drm/bridge/ptn3460.c: In function ‘ptn3460_pre_enable’:
    drivers/gpu/drm/bridge/ptn3460.c:135: error: implicit declaration of function ‘gpiod_set_value’
    drivers/gpu/drm/bridge/ptn3460.c: In function ‘ptn3460_probe’:
    drivers/gpu/drm/bridge/ptn3460.c:333: error: implicit declaration of function ‘devm_gpiod_get’
    drivers/gpu/drm/bridge/ptn3460.c:333: warning: assignment makes pointer from integer without a cast
    drivers/gpu/drm/bridge/ptn3460.c:340: error: implicit declaration of function ‘gpiod_direction_output’
    drivers/gpu/drm/bridge/ptn3460.c:346: warning: assignment makes pointer from integer without a cast

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

As the resulting driver won't work with GPIOLIB=n anyway, make
DRM_PTN3460 depend on GPIOLIB || COMPILE_TEST.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/bridge/Kconfig   | 4 ++--
 drivers/gpu/drm/bridge/ptn3460.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index acef3223772cb899..6cdcd2ec4848edec 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -5,8 +5,8 @@  config DRM_DW_HDMI
 
 config DRM_PTN3460
 	tristate "PTN3460 DP/LVDS bridge"
-	depends on DRM
-	depends on OF
+	depends on DRM && OF
+	depends on GPIOLIB || COMPILE_TEST
 	select DRM_KMS_HELPER
 	select DRM_PANEL
 	---help---
diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/ptn3460.c
index 9d2f053382e1889a..63a09e4079f358ff 100644
--- a/drivers/gpu/drm/bridge/ptn3460.c
+++ b/drivers/gpu/drm/bridge/ptn3460.c
@@ -15,6 +15,7 @@ 
 
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>