| From 2889dcb4c9930a6b11435549916b348a2ce429cb Mon Sep 17 00:00:00 2001 |
| From: Rob Herring <rob.herring@calxeda.com> |
| Date: Fri, 19 Apr 2013 17:32:52 -0500 |
| Subject: of: remove CONFIG_OF_DEVICE |
| |
| CONFIG_OF_DEVICE is always selected when CONFIG_OF is enabled, so remove |
| it and simplify of_platform.h and of_device.h headers. This also fixes |
| !OF compiles using of_platform_populate. |
| |
| Signed-off-by: Rob Herring <rob.herring@calxeda.com> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Signed-off-by: Grant Likely <grant.likely@linaro.org> |
| (cherry picked from commit ba166e900b502b74b9425881caa94f94891b0a1f) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/of/Kconfig | 3 --- |
| drivers/of/Makefile | 3 +-- |
| include/linux/of_device.h | 6 +++--- |
| 3 files changed, 4 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig |
| index d37bfcf5a3a2..80e5c13b930d 100644 |
| --- a/drivers/of/Kconfig |
| +++ b/drivers/of/Kconfig |
| @@ -48,9 +48,6 @@ config OF_IRQ |
| def_bool y |
| depends on !SPARC |
| |
| -config OF_DEVICE |
| - def_bool y |
| - |
| config OF_I2C |
| def_tristate I2C |
| depends on I2C |
| diff --git a/drivers/of/Makefile b/drivers/of/Makefile |
| index e027f444d10c..1f9c0c492ef9 100644 |
| --- a/drivers/of/Makefile |
| +++ b/drivers/of/Makefile |
| @@ -1,9 +1,8 @@ |
| -obj-y = base.o |
| +obj-y = base.o device.o platform.o |
| obj-$(CONFIG_OF_FLATTREE) += fdt.o |
| obj-$(CONFIG_OF_PROMTREE) += pdt.o |
| obj-$(CONFIG_OF_ADDRESS) += address.o |
| obj-$(CONFIG_OF_IRQ) += irq.o |
| -obj-$(CONFIG_OF_DEVICE) += device.o platform.o |
| obj-$(CONFIG_OF_I2C) += of_i2c.o |
| obj-$(CONFIG_OF_NET) += of_net.o |
| obj-$(CONFIG_OF_SELFTEST) += selftest.o |
| diff --git a/include/linux/of_device.h b/include/linux/of_device.h |
| index 901b7435e890..9d27475feec1 100644 |
| --- a/include/linux/of_device.h |
| +++ b/include/linux/of_device.h |
| @@ -4,12 +4,12 @@ |
| #include <linux/platform_device.h> |
| #include <linux/of_platform.h> /* temporary until merge */ |
| |
| -#ifdef CONFIG_OF_DEVICE |
| #include <linux/of.h> |
| #include <linux/mod_devicetable.h> |
| |
| struct device; |
| |
| +#ifdef CONFIG_OF |
| extern const struct of_device_id *of_match_device( |
| const struct of_device_id *matches, const struct device *dev); |
| extern void of_device_make_bus_id(struct device *dev); |
| @@ -43,7 +43,7 @@ static inline void of_device_node_put(struct device *dev) |
| of_node_put(dev->of_node); |
| } |
| |
| -#else /* CONFIG_OF_DEVICE */ |
| +#else /* CONFIG_OF */ |
| |
| static inline int of_driver_match_device(struct device *dev, |
| struct device_driver *drv) |
| @@ -67,6 +67,6 @@ static inline const struct of_device_id *of_match_device( |
| { |
| return NULL; |
| } |
| -#endif /* CONFIG_OF_DEVICE */ |
| +#endif /* CONFIG_OF */ |
| |
| #endif /* _LINUX_OF_DEVICE_H */ |
| -- |
| 1.8.5.rc3 |
| |