diff mbox

[02/27] drm/bridge: ps8622: #include <linux/gpio/consumer.h>, depend on GPIOLIB

Message ID 1430843563-18615-2-git-send-email-geert@linux-m68k.org (mailing list archive)
State Accepted
Headers 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/ps8622.c: In function ‘ps8622_pre_enable’:
    drivers/gpu/drm/bridge/ps8622.c:368: error: implicit declaration of function ‘gpiod_set_value’
    drivers/gpu/drm/bridge/ps8622.c: In function ‘ps8622_probe’:
    drivers/gpu/drm/bridge/ps8622.c:584: error: implicit declaration of function ‘devm_gpiod_get’
    drivers/gpu/drm/bridge/ps8622.c:584: warning: assignment makes pointer from integer without a cast
    drivers/gpu/drm/bridge/ps8622.c:590: error: implicit declaration of function ‘gpiod_direction_output’
    drivers/gpu/drm/bridge/ps8622.c:596: 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_PS8622 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/ps8622.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Thierry Reding June 5, 2015, 11:21 a.m. UTC | #1
On Tue, May 05, 2015 at 06:32:18PM +0200, Geert Uytterhoeven wrote:
> If GPIOLIB=n and asm-generic/gpio.h is not used:
> 
>     drivers/gpu/drm/bridge/ps8622.c: In function ‘ps8622_pre_enable’:
>     drivers/gpu/drm/bridge/ps8622.c:368: error: implicit declaration of function ‘gpiod_set_value’
>     drivers/gpu/drm/bridge/ps8622.c: In function ‘ps8622_probe’:
>     drivers/gpu/drm/bridge/ps8622.c:584: error: implicit declaration of function ‘devm_gpiod_get’
>     drivers/gpu/drm/bridge/ps8622.c:584: warning: assignment makes pointer from integer without a cast
>     drivers/gpu/drm/bridge/ps8622.c:590: error: implicit declaration of function ‘gpiod_direction_output’
>     drivers/gpu/drm/bridge/ps8622.c:596: 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_PS8622 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/ps8622.c | 1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)

Applied, thanks. With the same modifications as patch 1/27. I wonder if
there's any reason to keep the linux/gpio.h include, since consumer.h
seems to expose all the API that the drivers need.

Thierry
diff mbox

Patch

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 6cdcd2ec4848edec..3e562d3f37973efc 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -14,8 +14,8 @@  config DRM_PTN3460
 
 config DRM_PS8622
 	tristate "Parade eDP/LVDS bridge"
-	depends on DRM
-	depends on OF
+	depends on DRM && OF
+	depends on GPIOLIB || COMPILE_TEST
 	select DRM_PANEL
 	select DRM_KMS_HELPER
 	select BACKLIGHT_LCD_SUPPORT
diff --git a/drivers/gpu/drm/bridge/ps8622.c b/drivers/gpu/drm/bridge/ps8622.c
index e895aa7ea353164a..a9c38f8edf172bb9 100644
--- a/drivers/gpu/drm/bridge/ps8622.c
+++ b/drivers/gpu/drm/bridge/ps8622.c
@@ -18,6 +18,7 @@ 
 #include <linux/err.h>
 #include <linux/fb.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>