hw/intc/sh_intc: Drop another useless macro
The INT_REG_PARAMS macro was only used a few times within one function on adjacent lines and is actually more complex than writing out the parameters so simplify it by expanding the macro at call sites and dropping the #define. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <d3bdfdc5ab5ae1c51a6c6c38bde3829a99f85ce5.1635541329.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
81d18cd48a
commit
92d1d3ada1
|
@ -432,16 +432,12 @@ int sh_intc_init(MemoryRegion *sysmem,
|
||||||
memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc, "intc",
|
memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc, "intc",
|
||||||
0x100000000ULL);
|
0x100000000ULL);
|
||||||
|
|
||||||
#define INT_REG_PARAMS(reg_struct, type, action, j) \
|
|
||||||
reg_struct->action##_reg, #type, #action, j
|
|
||||||
if (desc->mask_regs) {
|
if (desc->mask_regs) {
|
||||||
for (i = 0; i < desc->nr_mask_regs; i++) {
|
for (i = 0; i < desc->nr_mask_regs; i++) {
|
||||||
struct intc_mask_reg *mr = desc->mask_regs + i;
|
struct intc_mask_reg *mr = desc->mask_regs + i;
|
||||||
|
|
||||||
j += sh_intc_register(sysmem, desc,
|
j += sh_intc_register(sysmem, desc, mr->set_reg, "mask", "set", j);
|
||||||
INT_REG_PARAMS(mr, mask, set, j));
|
j += sh_intc_register(sysmem, desc, mr->clr_reg, "mask", "clr", j);
|
||||||
j += sh_intc_register(sysmem, desc,
|
|
||||||
INT_REG_PARAMS(mr, mask, clr, j));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,13 +445,10 @@ int sh_intc_init(MemoryRegion *sysmem,
|
||||||
for (i = 0; i < desc->nr_prio_regs; i++) {
|
for (i = 0; i < desc->nr_prio_regs; i++) {
|
||||||
struct intc_prio_reg *pr = desc->prio_regs + i;
|
struct intc_prio_reg *pr = desc->prio_regs + i;
|
||||||
|
|
||||||
j += sh_intc_register(sysmem, desc,
|
j += sh_intc_register(sysmem, desc, pr->set_reg, "prio", "set", j);
|
||||||
INT_REG_PARAMS(pr, prio, set, j));
|
j += sh_intc_register(sysmem, desc, pr->clr_reg, "prio", "clr", j);
|
||||||
j += sh_intc_register(sysmem, desc,
|
|
||||||
INT_REG_PARAMS(pr, prio, clr, j));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#undef INT_REG_PARAMS
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue