Commit 48c06154 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Michael Ellerman
Browse files

powerpc/powernv: Merge common platform device initialisation 



opal_ipmi_init and opal_flash_init are equivalent, except for the
compatbile string. Merge these two into a common opal_pdev_init
function.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 18725226

arch/powerpc/platforms/powernv/opal.c

+6 −15
Original line number Diff line number Diff line
@@ -600,21 +600,13 @@ static void __init opal_dump_region_init(void) 
			"rc = %d\n", rc);

}



static void opal_flash_init(struct device_node *opal_node)

static void opal_pdev_init(struct device_node *opal_node,

		const char *compatible)

{

	struct device_node *np;



	for_each_child_of_node(opal_node, np)

		if (of_device_is_compatible(np, "ibm,opal-flash"))

			of_platform_device_create(np, NULL, NULL);

}



static void opal_ipmi_init(struct device_node *opal_node)

{

	struct device_node *np;



	for_each_child_of_node(opal_node, np)

		if (of_device_is_compatible(np, "ibm,opal-ipmi"))

		if (of_device_is_compatible(np, compatible))

			of_platform_device_create(np, NULL, NULL);

}
@@ -717,10 +709,9 @@ static int __init opal_init(void) 
		opal_msglog_init();

	}



	/* Initialize OPAL IPMI backend */

	opal_ipmi_init(opal_node);



	opal_flash_init(opal_node);

	/* Initialize platform devices: IPMI backend & flash interface */

	opal_pdev_init(opal_node, "ibm,opal-ipmi");

	opal_pdev_init(opal_node, "ibm,opal-flash");



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE