Commit f898f8db authored by Stephen Rothwell's avatar Stephen Rothwell

Begin consolidation of of_device.h

This just moves the common stuff from the arch of_device.h files to
linux/of_device.h.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f85ff305
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/of_device.h>
/** /**
* of_match_node - Tell if an device_node has a matching of_match structure * of_match_node - Tell if an device_node has a matching of_match structure
......
...@@ -3,14 +3,12 @@ ...@@ -3,14 +3,12 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/device.h> #include <linux/device.h>
#include <linux/mod_devicetable.h> #include <linux/of.h>
#include <asm/prom.h>
/* /*
* The of_device is a kind of "base class" that is a superset of * The of_device is a kind of "base class" that is a superset of
* struct device for use by devices attached to an OF node and * struct device for use by devices attached to an OF node and
* probed using OF properties * probed using OF properties.
*/ */
struct of_device struct of_device
{ {
...@@ -18,24 +16,14 @@ struct of_device ...@@ -18,24 +16,14 @@ struct of_device
u64 dma_mask; /* DMA mask */ u64 dma_mask; /* DMA mask */
struct device dev; /* Generic device interface */ struct device dev; /* Generic device interface */
}; };
#define to_of_device(d) container_of(d, struct of_device, dev)
extern const struct of_device_id *of_match_node(
const struct of_device_id *matches, const struct device_node *node);
extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct of_device *dev);
extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);
extern int of_device_register(struct of_device *ofdev);
extern void of_device_unregister(struct of_device *ofdev);
extern void of_release_dev(struct device *dev);
extern ssize_t of_device_get_modalias(struct of_device *ofdev, extern ssize_t of_device_get_modalias(struct of_device *ofdev,
char *str, ssize_t len); char *str, ssize_t len);
extern int of_device_uevent(struct device *dev, extern int of_device_uevent(struct device *dev,
char **envp, int num_envp, char *buffer, int buffer_size); char **envp, int num_envp, char *buffer, int buffer_size);
/* This is just here during the transition */
#include <linux/of_device.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_OF_DEVICE_H */ #endif /* _ASM_POWERPC_OF_DEVICE_H */
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/device.h> #include <linux/device.h>
#include <linux/of.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <asm/openprom.h> #include <asm/openprom.h>
#include <asm/prom.h>
extern struct bus_type ebus_bus_type; extern struct bus_type ebus_bus_type;
extern struct bus_type sbus_bus_type; extern struct bus_type sbus_bus_type;
...@@ -30,19 +30,12 @@ struct of_device ...@@ -30,19 +30,12 @@ struct of_device
int portid; int portid;
int clock_freq; int clock_freq;
}; };
#define to_of_device(d) container_of(d, struct of_device, dev)
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
extern struct of_device *of_find_device_by_node(struct device_node *); extern struct of_device *of_find_device_by_node(struct device_node *);
extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct of_device *dev);
extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);
/* /*
* An of_platform_driver driver is attached to a basic of_device on * An of_platform_driver driver is attached to a basic of_device on
* the ISA, EBUS, and SBUS busses on sparc64. * the ISA, EBUS, and SBUS busses on sparc64.
...@@ -67,13 +60,13 @@ struct of_platform_driver ...@@ -67,13 +60,13 @@ struct of_platform_driver
extern int of_register_driver(struct of_platform_driver *drv, extern int of_register_driver(struct of_platform_driver *drv,
struct bus_type *bus); struct bus_type *bus);
extern void of_unregister_driver(struct of_platform_driver *drv); extern void of_unregister_driver(struct of_platform_driver *drv);
extern int of_device_register(struct of_device *ofdev);
extern void of_device_unregister(struct of_device *ofdev);
extern struct of_device *of_platform_device_create(struct device_node *np, extern struct of_device *of_platform_device_create(struct device_node *np,
const char *bus_id, const char *bus_id,
struct device *parent, struct device *parent,
struct bus_type *bus); struct bus_type *bus);
extern void of_release_dev(struct device *dev);
/* This is just here during the transition */
#include <linux/of_device.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_SPARC_OF_DEVICE_H */ #endif /* _ASM_SPARC_OF_DEVICE_H */
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/device.h> #include <linux/device.h>
#include <linux/of.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <asm/openprom.h> #include <asm/openprom.h>
#include <asm/prom.h>
extern struct bus_type isa_bus_type; extern struct bus_type isa_bus_type;
extern struct bus_type ebus_bus_type; extern struct bus_type ebus_bus_type;
...@@ -31,19 +31,12 @@ struct of_device ...@@ -31,19 +31,12 @@ struct of_device
int portid; int portid;
int clock_freq; int clock_freq;
}; };
#define to_of_device(d) container_of(d, struct of_device, dev)
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
extern struct of_device *of_find_device_by_node(struct device_node *); extern struct of_device *of_find_device_by_node(struct device_node *);
extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct of_device *dev);
extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);
/* /*
* An of_platform_driver driver is attached to a basic of_device on * An of_platform_driver driver is attached to a basic of_device on
* the ISA, EBUS, and SBUS busses on sparc64. * the ISA, EBUS, and SBUS busses on sparc64.
...@@ -68,13 +61,13 @@ struct of_platform_driver ...@@ -68,13 +61,13 @@ struct of_platform_driver
extern int of_register_driver(struct of_platform_driver *drv, extern int of_register_driver(struct of_platform_driver *drv,
struct bus_type *bus); struct bus_type *bus);
extern void of_unregister_driver(struct of_platform_driver *drv); extern void of_unregister_driver(struct of_platform_driver *drv);
extern int of_device_register(struct of_device *ofdev);
extern void of_device_unregister(struct of_device *ofdev);
extern struct of_device *of_platform_device_create(struct device_node *np, extern struct of_device *of_platform_device_create(struct device_node *np,
const char *bus_id, const char *bus_id,
struct device *parent, struct device *parent,
struct bus_type *bus); struct bus_type *bus);
extern void of_release_dev(struct device *dev);
/* This is just here during the transition */
#include <linux/of_device.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_SPARC64_OF_DEVICE_H */ #endif /* _ASM_SPARC64_OF_DEVICE_H */
#ifndef _LINUX_OF_DEVICE_H
#define _LINUX_OF_DEVICE_H
#ifdef __KERNEL__
#include <linux/device.h>
#include <linux/of.h>
#include <linux/mod_devicetable.h>
#include <asm/of_device.h>
#define to_of_device(d) container_of(d, struct of_device, dev)
extern const struct of_device_id *of_match_node(
const struct of_device_id *matches, const struct device_node *node);
extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct of_device *dev);
extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);
extern int of_device_register(struct of_device *ofdev);
extern void of_device_unregister(struct of_device *ofdev);
extern void of_release_dev(struct device *dev);
#endif /* __KERNEL__ */
#endif /* _LINUX_OF_DEVICE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment