Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[thirdparty/linux.git] / include / linux / of_device.h

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index ce20d8b00b3e44c21126c8a11dfd26294ac651e5..2c7a3d4bc775b95f7092a181a75a2d6152e5a96d 100644 (file)
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -2,14 +2,14 @@
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
-#include <linux/cpu.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h> /* temporary until merge */
 
 #include <linux/of.h>
-#include <linux/mod_devicetable.h>
 
 struct device;
+struct of_device_id;
+struct kobj_uevent_env;
 
 #ifdef CONFIG_OF
 extern const struct of_device_id *of_match_device(
@@ -26,26 +26,11 @@ static inline int of_driver_match_device(struct device *dev,
        return of_match_device(drv->of_match_table, dev) != NULL;
 }
 
-extern int of_device_add(struct platform_device *pdev);
-extern int of_device_register(struct platform_device *ofdev);
-extern void of_device_unregister(struct platform_device *ofdev);
-
-extern const void *of_device_get_match_data(const struct device *dev);
-
 extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len);
 
 extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env);
 extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env);
 
-static inline struct device_node *of_cpu_device_node_get(int cpu)
-{
-       struct device *cpu_dev;
-       cpu_dev = get_cpu_device(cpu);
-       if (!cpu_dev)
-               return of_get_cpu_node(cpu, NULL);
-       return of_node_get(cpu_dev->of_node);
-}
-
 int of_dma_configure_id(struct device *dev,
                     struct device_node *np,
                     bool force_dma, const u32 *id);
@@ -66,11 +51,6 @@ static inline int of_driver_match_device(struct device *dev,
 static inline void of_device_uevent(const struct device *dev,
                        struct kobj_uevent_env *env) { }
 
-static inline const void *of_device_get_match_data(const struct device *dev)
-{
-       return NULL;
-}
-
 static inline int of_device_modalias(struct device *dev,
                                     char *str, ssize_t len)
 {
@@ -89,11 +69,6 @@ static inline const struct of_device_id *of_match_device(
        return NULL;
 }
 
-static inline struct device_node *of_cpu_device_node_get(int cpu)
-{
-       return NULL;
-}
-
 static inline int of_dma_configure_id(struct device *dev,
                                      struct device_node *np,
                                      bool force_dma,