Commit 1c96fcde authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/platforms: Use 'compatible' property for simple cases 



Use the new 'compatible' property for simple cases.

checkpatch complains about the new compatible being undocumented
but in reality nothing is new so just ignore it for the time
being.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu
parent 2fc39acf

arch/powerpc/platforms/44x/canyonlands.c

+4 −5
Original line number Diff line number Diff line
@@ -39,12 +39,10 @@ machine_device_initcall(canyonlands, ppc460ex_device_probe); 


static int __init ppc460ex_probe(void)

{

	if (of_machine_is_compatible("amcc,canyonlands")) {

	pci_set_flags(PCI_REASSIGN_ALL_RSRC);



	return 1;

}

	return 0;

}



/* USB PHY fixup code on Canyonlands kit. */
@@ -110,6 +108,7 @@ static int __init ppc460ex_canyonlands_fixup(void) 
machine_device_initcall(canyonlands, ppc460ex_canyonlands_fixup);

define_machine(canyonlands) {

	.name = "Canyonlands",

	.compatible = "amcc,canyonlands",

	.probe = ppc460ex_probe,

	.progress = udbg_progress,

	.init_IRQ = uic_init_tree,

arch/powerpc/platforms/44x/ebony.c

+1 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ machine_device_initcall(ebony, ebony_device_probe); 
 */

static int __init ebony_probe(void)

{

	if (!of_machine_is_compatible("ibm,ebony"))

		return 0;



	pci_set_flags(PCI_REASSIGN_ALL_RSRC);



	return 1;
@@ -55,6 +52,7 @@ static int __init ebony_probe(void) 


define_machine(ebony) {

	.name			= "Ebony",

	.compatible		= "ibm,ebony",

	.probe			= ebony_probe,

	.progress		= udbg_progress,

	.init_IRQ		= uic_init_tree,

arch/powerpc/platforms/44x/iss4xx.c

+1 −12
Original line number Diff line number Diff line
@@ -140,20 +140,9 @@ static void __init iss4xx_setup_arch(void) 
	iss4xx_smp_init();

}



/*

 * Called very early, MMU is off, device-tree isn't unflattened

 */

static int __init iss4xx_probe(void)

{

	if (!of_machine_is_compatible("ibm,iss-4xx"))

		return 0;



	return 1;

}



define_machine(iss4xx) {

	.name			= "ISS-4xx",

	.probe			= iss4xx_probe,

	.compatible		= "ibm,iss-4xx",

	.progress		= udbg_progress,

	.init_IRQ		= iss4xx_init_irq,

	.setup_arch		= iss4xx_setup_arch,

arch/powerpc/platforms/44x/sam440ep.c

+1 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ machine_device_initcall(sam440ep, sam440ep_device_probe); 


static int __init sam440ep_probe(void)

{

	if (!of_machine_is_compatible("acube,sam440ep"))

		return 0;



	pci_set_flags(PCI_REASSIGN_ALL_RSRC);



	return 1;
@@ -51,6 +48,7 @@ static int __init sam440ep_probe(void) 


define_machine(sam440ep) {

	.name 			= "Sam440ep",

	.compatible		= "acube,sam440ep",

	.probe 			= sam440ep_probe,

	.progress 		= udbg_progress,

	.init_IRQ 		= uic_init_tree,

arch/powerpc/platforms/44x/warp.c

+1 −9
Original line number Diff line number Diff line
@@ -41,17 +41,9 @@ static int __init warp_device_probe(void) 
}

machine_device_initcall(warp, warp_device_probe);



static int __init warp_probe(void)

{

	if (!of_machine_is_compatible("pika,warp"))

		return 0;



	return 1;

}



define_machine(warp) {

	.name		= "Warp",

	.probe 		= warp_probe,

	.compatible	= "pika,warp",

	.progress 	= udbg_progress,

	.init_IRQ 	= uic_init_tree,

	.get_irq 	= uic_get_irq,