[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <201302190258.25726.sergei.shtylyov@cogentembedded.com>
Date: Tue, 19 Feb 2013 02:58:25 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: grant.likely@...retlab.ca, rob.herring@...xeda.com,
devicetree-discuss@...ts.ozlabs.org
Cc: vladimir.barinov@...entembedded.com, linux-sh@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] <linux/of_platform.h>: fix compilation warnings with DT disabled
Fix the following compilation warnings (in Simon Horman's renesas.git repo):
In file included from arch/arm/mach-shmobile/setup-r8a7779.c:24:0:
include/linux/of_platform.h:107:13: warning: ‘struct of_device_id’ declared
inside parameter list [enabled by default]
include/linux/of_platform.h:107:13: warning: its scope is only this definition
or declaration, which is probably not what you want [enabled by default]
include/linux/of_platform.h:107:13: warning: ‘struct device_node’ declared
inside parameter list [enabled by default]
<linux/of_platform.h> only #include's headers with definitions of the above
mentioned structures if CONFIG_OF_DEVICE=y but uses them even if not. One
solution is to move some #include's out of #ifdef CONFIG_OF_DEVICE and use
incomplete declarations for the rest of the structures where the #ifdef move
doesn't help...
Reported-by: Vladimir Barinov <vladimir.barinov@...entembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
---
Actually, it compiles eve without 'struct device_node' declared, I haven't
found the reason of this, so left it there...
include/linux/of_platform.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux/include/linux/of_platform.h
===================================================================
--- linux.orig/include/linux/of_platform.h
+++ linux/include/linux/of_platform.h
@@ -11,9 +11,10 @@
*
*/
-#ifdef CONFIG_OF_DEVICE
#include <linux/device.h>
#include <linux/mod_devicetable.h>
+
+#ifdef CONFIG_OF_DEVICE
#include <linux/pm.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@@ -100,7 +101,7 @@ extern int of_platform_populate(struct d
#if !defined(CONFIG_OF_ADDRESS)
struct of_dev_auxdata;
-struct device;
+struct device_node;
static inline int of_platform_populate(struct device_node *root,
const struct of_device_id *matches,
const struct of_dev_auxdata *lookup,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists