diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-01 02:40:36 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-19 23:39:59 -0400 |
commit | f85ff3056cefdf4635ebf98b30e9a7d86521567f (patch) | |
tree | f08bc591d6219b287261452a3f5dde58d6b5dd79 /arch/powerpc/kernel/of_device.c | |
parent | 1ef4d4242d9c494c49ae1ae66dc938fce0272816 (diff) |
Begin to consolidate of_device.c
This moves all the common parts for the Sparc, Sparc64 and PowerPC
of_device.c files into drivers/of/device.c.
Apart from the simple move, Sparc gains of_match_node() and a call to
of_node_put in of_release_dev(). PowerPC gains better recovery if
device_create_file() fails in of_device_register().
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Paul Mackerras <paulus@samba.org>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/kernel/of_device.c')
-rw-r--r-- | arch/powerpc/kernel/of_device.c | 122 |
1 files changed, 1 insertions, 121 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index a464d67248df..89b911e83c04 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <linux/string.h> | 1 | #include <linux/string.h> |
2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
3 | #include <linux/of.h> | ||
3 | #include <linux/init.h> | 4 | #include <linux/init.h> |
4 | #include <linux/module.h> | 5 | #include <linux/module.h> |
5 | #include <linux/mod_devicetable.h> | 6 | #include <linux/mod_devicetable.h> |
@@ -8,118 +9,6 @@ | |||
8 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
9 | #include <asm/of_device.h> | 10 | #include <asm/of_device.h> |
10 | 11 | ||
11 | /** | ||
12 | * of_match_node - Tell if an device_node has a matching of_match structure | ||
13 | * @ids: array of of device match structures to search in | ||
14 | * @node: the of device structure to match against | ||
15 | * | ||
16 | * Low level utility function used by device matching. | ||
17 | */ | ||
18 | const struct of_device_id *of_match_node(const struct of_device_id *matches, | ||
19 | const struct device_node *node) | ||
20 | { | ||
21 | while (matches->name[0] || matches->type[0] || matches->compatible[0]) { | ||
22 | int match = 1; | ||
23 | if (matches->name[0]) | ||
24 | match &= node->name | ||
25 | && !strcmp(matches->name, node->name); | ||
26 | if (matches->type[0]) | ||
27 | match &= node->type | ||
28 | && !strcmp(matches->type, node->type); | ||
29 | if (matches->compatible[0]) | ||
30 | match &= of_device_is_compatible(node, | ||
31 | matches->compatible); | ||
32 | if (match) | ||
33 | return matches; | ||
34 | matches++; | ||
35 | } | ||
36 | return NULL; | ||
37 | } | ||
38 | |||
39 | /** | ||
40 | * of_match_device - Tell if an of_device structure has a matching | ||
41 | * of_match structure | ||
42 | * @ids: array of of device match structures to search in | ||
43 | * @dev: the of device structure to match against | ||
44 | * | ||
45 | * Used by a driver to check whether an of_device present in the | ||
46 | * system is in its list of supported devices. | ||
47 | */ | ||
48 | const struct of_device_id *of_match_device(const struct of_device_id *matches, | ||
49 | const struct of_device *dev) | ||
50 | { | ||
51 | if (!dev->node) | ||
52 | return NULL; | ||
53 | return of_match_node(matches, dev->node); | ||
54 | } | ||
55 | |||
56 | struct of_device *of_dev_get(struct of_device *dev) | ||
57 | { | ||
58 | struct device *tmp; | ||
59 | |||
60 | if (!dev) | ||
61 | return NULL; | ||
62 | tmp = get_device(&dev->dev); | ||
63 | if (tmp) | ||
64 | return to_of_device(tmp); | ||
65 | else | ||
66 | return NULL; | ||
67 | } | ||
68 | |||
69 | void of_dev_put(struct of_device *dev) | ||
70 | { | ||
71 | if (dev) | ||
72 | put_device(&dev->dev); | ||
73 | } | ||
74 | |||
75 | static ssize_t dev_show_devspec(struct device *dev, | ||
76 | struct device_attribute *attr, char *buf) | ||
77 | { | ||
78 | struct of_device *ofdev; | ||
79 | |||
80 | ofdev = to_of_device(dev); | ||
81 | return sprintf(buf, "%s", ofdev->node->full_name); | ||
82 | } | ||
83 | |||
84 | static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL); | ||
85 | |||
86 | /** | ||
87 | * of_release_dev - free an of device structure when all users of it are finished. | ||
88 | * @dev: device that's been disconnected | ||
89 | * | ||
90 | * Will be called only by the device core when all users of this of device are | ||
91 | * done. | ||
92 | */ | ||
93 | void of_release_dev(struct device *dev) | ||
94 | { | ||
95 | struct of_device *ofdev; | ||
96 | |||
97 | ofdev = to_of_device(dev); | ||
98 | of_node_put(ofdev->node); | ||
99 | kfree(ofdev); | ||
100 | } | ||
101 | |||
102 | int of_device_register(struct of_device *ofdev) | ||
103 | { | ||
104 | int rc; | ||
105 | |||
106 | BUG_ON(ofdev->node == NULL); | ||
107 | |||
108 | rc = device_register(&ofdev->dev); | ||
109 | if (rc) | ||
110 | return rc; | ||
111 | |||
112 | return device_create_file(&ofdev->dev, &dev_attr_devspec); | ||
113 | } | ||
114 | |||
115 | void of_device_unregister(struct of_device *ofdev) | ||
116 | { | ||
117 | device_remove_file(&ofdev->dev, &dev_attr_devspec); | ||
118 | |||
119 | device_unregister(&ofdev->dev); | ||
120 | } | ||
121 | |||
122 | |||
123 | ssize_t of_device_get_modalias(struct of_device *ofdev, | 12 | ssize_t of_device_get_modalias(struct of_device *ofdev, |
124 | char *str, ssize_t len) | 13 | char *str, ssize_t len) |
125 | { | 14 | { |
@@ -229,14 +118,5 @@ int of_device_uevent(struct device *dev, | |||
229 | 118 | ||
230 | return 0; | 119 | return 0; |
231 | } | 120 | } |
232 | |||
233 | |||
234 | EXPORT_SYMBOL(of_match_node); | ||
235 | EXPORT_SYMBOL(of_match_device); | ||
236 | EXPORT_SYMBOL(of_device_register); | ||
237 | EXPORT_SYMBOL(of_device_unregister); | ||
238 | EXPORT_SYMBOL(of_dev_get); | ||
239 | EXPORT_SYMBOL(of_dev_put); | ||
240 | EXPORT_SYMBOL(of_release_dev); | ||
241 | EXPORT_SYMBOL(of_device_uevent); | 121 | EXPORT_SYMBOL(of_device_uevent); |
242 | EXPORT_SYMBOL(of_device_get_modalias); | 122 | EXPORT_SYMBOL(of_device_get_modalias); |