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>
This commit is contained in:
parent
8973ba8b32
commit
ba166e900b
|
@ -48,9 +48,6 @@ config OF_IRQ
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on !SPARC
|
depends on !SPARC
|
||||||
|
|
||||||
config OF_DEVICE
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
config OF_I2C
|
config OF_I2C
|
||||||
def_tristate I2C
|
def_tristate I2C
|
||||||
depends on I2C
|
depends on I2C
|
||||||
|
|
|
@ -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_FLATTREE) += fdt.o
|
||||||
obj-$(CONFIG_OF_PROMTREE) += pdt.o
|
obj-$(CONFIG_OF_PROMTREE) += pdt.o
|
||||||
obj-$(CONFIG_OF_ADDRESS) += address.o
|
obj-$(CONFIG_OF_ADDRESS) += address.o
|
||||||
obj-$(CONFIG_OF_IRQ) += irq.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_I2C) += of_i2c.o
|
||||||
obj-$(CONFIG_OF_NET) += of_net.o
|
obj-$(CONFIG_OF_NET) += of_net.o
|
||||||
obj-$(CONFIG_OF_SELFTEST) += selftest.o
|
obj-$(CONFIG_OF_SELFTEST) += selftest.o
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/of_platform.h> /* temporary until merge */
|
#include <linux/of_platform.h> /* temporary until merge */
|
||||||
|
|
||||||
#ifdef CONFIG_OF_DEVICE
|
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/mod_devicetable.h>
|
#include <linux/mod_devicetable.h>
|
||||||
|
|
||||||
struct device;
|
struct device;
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF
|
||||||
extern const struct of_device_id *of_match_device(
|
extern const struct of_device_id *of_match_device(
|
||||||
const struct of_device_id *matches, const struct device *dev);
|
const struct of_device_id *matches, const struct device *dev);
|
||||||
extern void of_device_make_bus_id(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);
|
of_node_put(dev->of_node);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* CONFIG_OF_DEVICE */
|
#else /* CONFIG_OF */
|
||||||
|
|
||||||
static inline int of_driver_match_device(struct device *dev,
|
static inline int of_driver_match_device(struct device *dev,
|
||||||
struct device_driver *drv)
|
struct device_driver *drv)
|
||||||
|
@ -67,6 +67,6 @@ static inline const struct of_device_id *of_match_device(
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_OF_DEVICE */
|
#endif /* CONFIG_OF */
|
||||||
|
|
||||||
#endif /* _LINUX_OF_DEVICE_H */
|
#endif /* _LINUX_OF_DEVICE_H */
|
||||||
|
|
Loading…
Reference in a new issue