UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230408140122.25293-3-pali@kernel.org
This commit is contained in:
Christophe Leroy 2023-04-08 16:01:11 +02:00 committed by Michael Ellerman
parent 6faab5d7ac
commit 0abc1eadd6
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/platforms/85xx/mpc85xx_ds.c
View File

@ -50,23 +50,17 @@ static void mpc85xx_8259_cascade(struct irq_desc *desc)
void __init mpc85xx_ds_pic_init(void) void __init mpc85xx_ds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
#ifdef CONFIG_PPC_I8259 #ifdef CONFIG_PPC_I8259
struct device_node *np; struct device_node *np;
struct device_node *cascade_node = NULL; struct device_node *cascade_node = NULL;
int cascade_irq; int cascade_irq;
#endif #endif
if (of_machine_is_compatible("fsl,MPC8572DS-CAMP")) {
mpic = mpic_alloc(NULL, 0, if (of_machine_is_compatible("fsl,MPC8572DS-CAMP"))
MPIC_NO_RESET | flags |= MPIC_NO_RESET;
MPIC_BIG_ENDIAN |
MPIC_SINGLE_DEST_CPU, mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC ");
0, 256, " OpenPIC ");
} else {
mpic = mpic_alloc(NULL, 0,
MPIC_BIG_ENDIAN |
MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC ");
}
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);

16
arch/powerpc/platforms/85xx/mpc85xx_rdb.c
View File

@ -32,18 +32,12 @@
void __init mpc85xx_rdb_pic_init(void) void __init mpc85xx_rdb_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU;
if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP")) { if (of_machine_is_compatible("fsl,MPC85XXRDB-CAMP"))
mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET | flags |= MPIC_NO_RESET;
MPIC_BIG_ENDIAN |
MPIC_SINGLE_DEST_CPU, mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC ");
0, 256, " OpenPIC ");
} else {
mpic = mpic_alloc(NULL, 0,
MPIC_BIG_ENDIAN |
MPIC_SINGLE_DEST_CPU,
0, 256, " OpenPIC ");
}
BUG_ON(mpic == NULL); BUG_ON(mpic == NULL);
mpic_init(mpic); mpic_init(mpic);