Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91bdd15 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 92d1616e

arch/powerpc/kernel/of_platform.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/of_platform.h

+1 −1
Original line number Diff line number Diff line
@@ -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);