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/sparc64/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/sparc64/kernel/of_device.c')
-rw-r--r-- | arch/sparc64/kernel/of_device.c | 114 |
1 files changed, 3 insertions, 111 deletions
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 6676b93219dc..68927bc3d3a9 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/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,38 +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_device - Tell if an of_device structure has a matching | ||
13 | * of_match structure | ||
14 | * @ids: array of of device match structures to search in | ||
15 | * @dev: the of device structure to match against | ||
16 | * | ||
17 | * Used by a driver to check whether an of_device present in the | ||
18 | * system is in its list of supported devices. | ||
19 | */ | ||
20 | const struct of_device_id *of_match_device(const struct of_device_id *matches, | ||
21 | const struct of_device *dev) | ||
22 | { | ||
23 | if (!dev->node) | ||
24 | return NULL; | ||
25 | while (matches->name[0] || matches->type[0] || matches->compatible[0]) { | ||
26 | int match = 1; | ||
27 | if (matches->name[0]) | ||
28 | match &= dev->node->name | ||
29 | && !strcmp(matches->name, dev->node->name); | ||
30 | if (matches->type[0]) | ||
31 | match &= dev->node->type | ||
32 | && !strcmp(matches->type, dev->node->type); | ||
33 | if (matches->compatible[0]) | ||
34 | match &= of_device_is_compatible(dev->node, | ||
35 | matches->compatible); | ||
36 | if (match) | ||
37 | return matches; | ||
38 | matches++; | ||
39 | } | ||
40 | return NULL; | ||
41 | } | ||
42 | |||
43 | static int of_platform_bus_match(struct device *dev, struct device_driver *drv) | 12 | static int of_platform_bus_match(struct device *dev, struct device_driver *drv) |
44 | { | 13 | { |
45 | struct of_device * of_dev = to_of_device(dev); | 14 | struct of_device * of_dev = to_of_device(dev); |
@@ -52,26 +21,6 @@ static int of_platform_bus_match(struct device *dev, struct device_driver *drv) | |||
52 | return of_match_device(matches, of_dev) != NULL; | 21 | return of_match_device(matches, of_dev) != NULL; |
53 | } | 22 | } |
54 | 23 | ||
55 | struct of_device *of_dev_get(struct of_device *dev) | ||
56 | { | ||
57 | struct device *tmp; | ||
58 | |||
59 | if (!dev) | ||
60 | return NULL; | ||
61 | tmp = get_device(&dev->dev); | ||
62 | if (tmp) | ||
63 | return to_of_device(tmp); | ||
64 | else | ||
65 | return NULL; | ||
66 | } | ||
67 | |||
68 | void of_dev_put(struct of_device *dev) | ||
69 | { | ||
70 | if (dev) | ||
71 | put_device(&dev->dev); | ||
72 | } | ||
73 | |||
74 | |||
75 | static int of_device_probe(struct device *dev) | 24 | static int of_device_probe(struct device *dev) |
76 | { | 25 | { |
77 | int error = -ENODEV; | 26 | int error = -ENODEV; |
@@ -1020,61 +969,13 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) | |||
1020 | /* register with core */ | 969 | /* register with core */ |
1021 | return driver_register(&drv->driver); | 970 | return driver_register(&drv->driver); |
1022 | } | 971 | } |
972 | EXPORT_SYMBOL(of_register_driver); | ||
1023 | 973 | ||
1024 | void of_unregister_driver(struct of_platform_driver *drv) | 974 | void of_unregister_driver(struct of_platform_driver *drv) |
1025 | { | 975 | { |
1026 | driver_unregister(&drv->driver); | 976 | driver_unregister(&drv->driver); |
1027 | } | 977 | } |
1028 | 978 | EXPORT_SYMBOL(of_unregister_driver); | |
1029 | |||
1030 | static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) | ||
1031 | { | ||
1032 | struct of_device *ofdev; | ||
1033 | |||
1034 | ofdev = to_of_device(dev); | ||
1035 | return sprintf(buf, "%s", ofdev->node->full_name); | ||
1036 | } | ||
1037 | |||
1038 | static DEVICE_ATTR(devspec, S_IRUGO, dev_show_devspec, NULL); | ||
1039 | |||
1040 | /** | ||
1041 | * of_release_dev - free an of device structure when all users of it are finished. | ||
1042 | * @dev: device that's been disconnected | ||
1043 | * | ||
1044 | * Will be called only by the device core when all users of this of device are | ||
1045 | * done. | ||
1046 | */ | ||
1047 | void of_release_dev(struct device *dev) | ||
1048 | { | ||
1049 | struct of_device *ofdev; | ||
1050 | |||
1051 | ofdev = to_of_device(dev); | ||
1052 | |||
1053 | kfree(ofdev); | ||
1054 | } | ||
1055 | |||
1056 | int of_device_register(struct of_device *ofdev) | ||
1057 | { | ||
1058 | int rc; | ||
1059 | |||
1060 | BUG_ON(ofdev->node == NULL); | ||
1061 | |||
1062 | rc = device_register(&ofdev->dev); | ||
1063 | if (rc) | ||
1064 | return rc; | ||
1065 | |||
1066 | rc = device_create_file(&ofdev->dev, &dev_attr_devspec); | ||
1067 | if (rc) | ||
1068 | device_unregister(&ofdev->dev); | ||
1069 | |||
1070 | return rc; | ||
1071 | } | ||
1072 | |||
1073 | void of_device_unregister(struct of_device *ofdev) | ||
1074 | { | ||
1075 | device_remove_file(&ofdev->dev, &dev_attr_devspec); | ||
1076 | device_unregister(&ofdev->dev); | ||
1077 | } | ||
1078 | 979 | ||
1079 | struct of_device* of_platform_device_create(struct device_node *np, | 980 | struct of_device* of_platform_device_create(struct device_node *np, |
1080 | const char *bus_id, | 981 | const char *bus_id, |
@@ -1100,13 +1001,4 @@ struct of_device* of_platform_device_create(struct device_node *np, | |||
1100 | 1001 | ||
1101 | return dev; | 1002 | return dev; |
1102 | } | 1003 | } |
1103 | |||
1104 | EXPORT_SYMBOL(of_match_device); | ||
1105 | EXPORT_SYMBOL(of_register_driver); | ||
1106 | EXPORT_SYMBOL(of_unregister_driver); | ||
1107 | EXPORT_SYMBOL(of_device_register); | ||
1108 | EXPORT_SYMBOL(of_device_unregister); | ||
1109 | EXPORT_SYMBOL(of_dev_get); | ||
1110 | EXPORT_SYMBOL(of_dev_put); | ||
1111 | EXPORT_SYMBOL(of_platform_device_create); | 1004 | EXPORT_SYMBOL(of_platform_device_create); |
1112 | EXPORT_SYMBOL(of_release_dev); | ||