diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-21 15:21:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 22:14:07 +1100 |
| 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 79c04d151dd..de36e235a60 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c @@ -40,7 +40,7 @@ * a bus type in the list */ -static struct of_device_id of_default_bus_ids[] = { +static const struct of_device_id of_default_bus_ids[] = { { .type = "soc", }, { .compatible = "soc", }, { .type = "spider", }, @@ -100,8 +100,8 @@ EXPORT_SYMBOL(of_platform_device_create); * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to * disallow recursive creation of child busses */ -static int of_platform_bus_create(struct device_node *bus, - struct of_device_id *matches, +static int of_platform_bus_create(const struct device_node *bus, + const struct of_device_id *matches, struct device *parent) { struct device_node *child; @@ -137,7 +137,7 @@ static int of_platform_bus_create(struct device_node *bus, */ int of_platform_bus_probe(struct device_node *root, - struct of_device_id *matches, + const struct of_device_id *matches, struct device *parent) { struct device_node *child; diff --git a/include/asm-powerpc/of_platform.h b/include/asm-powerpc/of_platform.h index d20a4cd08fa..1bce5efe1de 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, #define OF_NO_DEEP_PROBE ((struct of_device_id *)-1) extern int of_platform_bus_probe(struct device_node *root, - struct of_device_id *matches, + const struct of_device_id *matches, struct device *parent); extern struct of_device *of_find_device_by_phandle(phandle ph); |