videomode: provide dummy of_get_display_timing helper

Commit Message

Tomi Valkeinen Oct. 6, 2014, 12:18 p.m. UTC

On 29/09/14 23:43, Laurent Pinchart wrote:
> Hi Arnd,
> 
> Thank you for the patch.
> 
> On Monday 29 September 2014 18:00:33 Arnd Bergmann wrote:
>> If CONFIG_OF is disabled but we build any driver that tries to
>> use of_get_display_timing, we get this link error:
>>
>> ERROR: "of_get_display_timing" [drivers/gpu/drm/rcar-du/rcar-du-drm.ko]
>> undefined!
>>
>> This adds an empty inline function as an alternative, to avoid changing
>> each driver using this function when we want to build them without
>> CONFIG_OF.
>>
>> Signed-off-by: Arnd Bergmann <[e-mail]>
> 
> Shouldn't empty functions also be defined for of_get_display_timings and 
> of_display_timings_exist ?

I took the liberty of updating the patch. 

Btw, if I just select "Renesas ARM SoCs (non-multiplatform)", without any of
the "Renesas ARM SoCs System Type" items, I get compile prints like "warning:
"__LINUX_ARM_ARCH__" is not defined".

And if I select only "ARCH_SH7372", I get "arm-linux-gnueabihf-ld: no machine
record defined".

In any case, I was able to compile the drivers/gpu/drm/rcar-du/rcar-du-drm.ko,
so I believe the patch is ok.

 Tomi

From bd1815e4bff50b5569d1989aaf9096d14ce71d12 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <[e-mail]>
Date: Mon, 6 Oct 2014 15:03:57 +0300
Subject: [PATCH] videomode: provide dummy inline functions for !CONFIG_OF

If CONFIG_OF is disabled but we build any driver that tries to
use of_get_display_timing, we get this link error:

ERROR: "of_get_display_timing" [drivers/gpu/drm/rcar-du/rcar-du-drm.ko] undefined!

This adds an empty inline function as an alternative, to avoid changing
each driver using this function when we want to build them without
CONFIG_OF.

Reported-by: Arnd Bergmann <[e-mail]>
Signed-off-by: Tomi Valkeinen <[e-mail]>
---
 include/video/of_display_timing.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Patch

diff --git a/include/video/of_display_timing.h b/include/video/of_display_timing.h
index 79e6697af6cf..3a180c097e7c 100644
--- a/include/video/of_display_timing.h
+++ b/include/video/of_display_timing.h
@@ -15,9 +15,26 @@  struct display_timings;
 
 #define OF_USE_NATIVE_MODE -1
 
+#ifdef CONFIG_OF
 int of_get_display_timing(struct device_node *np, const char *name,
 		struct display_timing *dt);
 struct display_timings *of_get_display_timings(struct device_node *np);
 int of_display_timings_exist(struct device_node *np);
+#else
+static inline int of_get_display_timing(struct device_node *np, const char *name,
+		struct display_timing *dt)
+{
+	return -ENOSYS;
+}
+static inline struct display_timings *of_get_display_timings(struct device_node *np)
+{
+	return NULL;
+}
+static inline int of_display_timings_exist(struct device_node *np)
+{
+	return -ENOSYS;
+}
+
+#endif
 
 #endif