diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-20 23:21:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:14:07 -0500 |
commit | b91bdd15174ca7104905d74aaf89a6815c3f9d8c (patch) | |
tree | 70ee916903313ff1f412276bd52046d53eae8cb9 | |
parent | 92d1616ec0302266dd753a6c2fc5b2f6e7d36a72 (diff) |
[POWERPC] Constify the of_device_id passed to of_platform_bus_probe
This will allow us to declare const all the statically declared arrrays
of these.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/of_platform.c | 8 | ||||
-rw-r--r-- | include/asm-powerpc/of_platform.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 79c04d151ddb..de36e235a60a 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * a bus type in the list | 40 | * a bus type in the list |
41 | */ | 41 | */ |
42 | 42 | ||
43 | static struct of_device_id of_default_bus_ids[] = { | 43 | static const struct of_device_id of_default_bus_ids[] = { |
44 | { .type = "soc", }, | 44 | { .type = "soc", }, |
45 | { .compatible = "soc", }, | 45 | { .compatible = "soc", }, |
46 | { .type = "spider", }, | 46 | { .type = "spider", }, |
@@ -100,8 +100,8 @@ EXPORT_SYMBOL(of_platform_device_create); | |||
100 | * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to | 100 | * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to |
101 | * disallow recursive creation of child busses | 101 | * disallow recursive creation of child busses |
102 | */ | 102 | */ |
103 | static int of_platform_bus_create(struct device_node *bus, | 103 | static int of_platform_bus_create(const struct device_node *bus, |
104 | struct of_device_id *matches, | 104 | const struct of_device_id *matches, |
105 | struct device *parent) | 105 | struct device *parent) |
106 | { | 106 | { |
107 | struct device_node *child; | 107 | struct device_node *child; |
@@ -137,7 +137,7 @@ static int of_platform_bus_create(struct device_node *bus, | |||
137 | */ | 137 | */ |
138 | 138 | ||
139 | int of_platform_bus_probe(struct device_node *root, | 139 | int of_platform_bus_probe(struct device_node *root, |
140 | struct of_device_id *matches, | 140 | const struct of_device_id *matches, |
141 | struct device *parent) | 141 | struct device *parent) |
142 | { | 142 | { |
143 | struct device_node *child; | 143 | struct device_node *child; |
diff --git a/include/asm-powerpc/of_platform.h b/include/asm-powerpc/of_platform.h index d20a4cd08fa1..1bce5efe1de0 100644 --- a/include/asm-powerpc/of_platform.h +++ b/include/asm-powerpc/of_platform.h | |||
@@ -32,7 +32,7 @@ extern struct of_device *of_platform_device_create(struct device_node *np, | |||
32 | #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1) | 32 | #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1) |
33 | 33 | ||
34 | extern int of_platform_bus_probe(struct device_node *root, | 34 | extern int of_platform_bus_probe(struct device_node *root, |
35 | struct of_device_id *matches, | 35 | const struct of_device_id *matches, |
36 | struct device *parent); | 36 | struct device *parent); |
37 | 37 | ||
38 | extern struct of_device *of_find_device_by_phandle(phandle ph); | 38 | extern struct of_device *of_find_device_by_phandle(phandle ph); |