Commit 0abc1ead authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc() 



Reduce number of lines in the call to mpic_alloc().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-3-pali@kernel.org
parent 6faab5d7

arch/powerpc/platforms/85xx/mpc85xx_ds.c

+6 −12
Original line number Diff line number Diff line
@@ -50,23 +50,17 @@ static void mpc85xx_8259_cascade(struct irq_desc *desc) 
void __init mpc85xx_ds_pic_init(void)

{

	struct mpic *mpic;

	int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;

#ifdef CONFIG_PPC_I8259

	struct device_node *np;

	struct device_node *cascade_node = NULL;

	int cascade_irq;

#endif

	if (of_machine_is_compatible("fsl,MPC8572DS-CAMP")) {

		mpic = mpic_alloc(NULL, 0,

			MPIC_NO_RESET |

			MPIC_BIG_ENDIAN |

			MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	} else {

		mpic = mpic_alloc(NULL, 0,

			  MPIC_BIG_ENDIAN |

			  MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	}



	if (of_machine_is_compatible("fsl,MPC8572DS-CAMP"))

		flags |= MPIC_NO_RESET;



	mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");



	BUG_ON(mpic == NULL);

	mpic_init(mpic);

arch/powerpc/platforms/85xx/mpc85xx_rdb.c

+5 −11
Original line number Diff line number Diff line
@@ -32,18 +32,12 @@ 
void __init mpc85xx_rdb_pic_init(void)

{

	struct mpic *mpic;

	int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;



	if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP")) {

		mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET |

			MPIC_BIG_ENDIAN |

			MPIC_SINGLE_DEST_CPU,

			0, 256, " OpenPIC  ");

	} else {

		mpic = mpic_alloc(NULL, 0,

		  MPIC_BIG_ENDIAN |

		  MPIC_SINGLE_DEST_CPU,

		  0, 256, " OpenPIC  ");

	}

	if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP"))

		flags |= MPIC_NO_RESET;



	mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC  ");



	BUG_ON(mpic == NULL);

	mpic_init(mpic);