summaryrefslogtreecommitdiff
path: root/include/linux/of_platform.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-01 00:22:52 +0200
committerGrant Likely <grant.likely@linaro.org>2013-06-12 10:23:17 +0100
commit8a46f4f7f95f2bece108998a2e1b87b58f99d590 (patch)
tree772e3515955983e0284be67dec9f88e7860148a4 /include/linux/of_platform.h
parent317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff)
downloadlwn-8a46f4f7f95f2bece108998a2e1b87b58f99d590.tar.gz
lwn-8a46f4f7f95f2bece108998a2e1b87b58f99d590.zip
of: remove #ifdef from linux/of_platform.h
A lot of code uses the functions from of_platform.h when built for devicetree-enabled platforms but can also be built without them. In order to avoid using #ifdef everywhere in drivers, this makes all the function declarations visible, which means we can use "if (IS_ENABLED(CONFIG_OF))" in driver code and get build coverage over the code but let the compiler drop the reference in the object code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Grant Likely <grant.likely@linaro.org> Cc: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'include/linux/of_platform.h')
-rw-r--r--include/linux/of_platform.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 2a93b64a3869..7747ad0027ae 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -13,8 +13,6 @@
#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>
@@ -82,7 +80,6 @@ extern struct platform_device *of_device_alloc(struct device_node *np,
struct device *parent);
extern struct platform_device *of_find_device_by_node(struct device_node *np);
-#ifdef CONFIG_OF_ADDRESS /* device reg helpers depend on OF_ADDRESS */
/* Platform devices and busses creation */
extern struct platform_device *of_platform_device_create(struct device_node *np,
const char *bus_id,
@@ -91,17 +88,12 @@ extern struct platform_device *of_platform_device_create(struct device_node *np,
extern int of_platform_bus_probe(struct device_node *root,
const struct of_device_id *matches,
struct device *parent);
+#ifdef CONFIG_OF_ADDRESS
extern int of_platform_populate(struct device_node *root,
const struct of_device_id *matches,
const struct of_dev_auxdata *lookup,
struct device *parent);
-#endif /* CONFIG_OF_ADDRESS */
-
-#endif /* CONFIG_OF_DEVICE */
-
-#if !defined(CONFIG_OF_ADDRESS)
-struct of_dev_auxdata;
-struct device_node;
+#else
static inline int of_platform_populate(struct device_node *root,
const struct of_device_id *matches,
const struct of_dev_auxdata *lookup,
@@ -109,6 +101,6 @@ static inline int of_platform_populate(struct device_node *root,
{
return -ENODEV;
}
-#endif /* !CONFIG_OF_ADDRESS */
+#endif
#endif /* _LINUX_OF_PLATFORM_H */