Skip to content

Commit

Permalink
[POWERPC] Constify the of_device_id passed to of_platform_bus_probe
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Dec 21, 2007
1 parent 92d1616 commit b91bdd1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions arch/powerpc/kernel/of_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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", },
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/asm-powerpc/of_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b91bdd1

Please sign in to comment.