| Message ID | 20191025124058.22580-12-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | QUICC Engine support on ARM | expand |
Le 25/10/2019 à 14:40, Rasmus Villemoes a écrit : > The qe_ic_cascade_{low,high}_mpic functions are now used as handlers > both when the interrupt parent is mpic as well as ipic, so remove the > _mpic suffix. Here you are modifying code that you drop in patch 14. That's pointless. You should perform name change after patch 14. Christophe > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > arch/powerpc/platforms/83xx/misc.c | 2 +- > arch/powerpc/platforms/85xx/corenet_generic.c | 4 ++-- > arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 ++-- > arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 4 ++-- > arch/powerpc/platforms/85xx/twr_p102x.c | 4 ++-- > drivers/soc/fsl/qe/qe_ic.c | 4 ++-- > include/soc/fsl/qe/qe_ic.h | 4 ++-- > 7 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c > index 779791c0570f..835d082218ae 100644 > --- a/arch/powerpc/platforms/83xx/misc.c > +++ b/arch/powerpc/platforms/83xx/misc.c > @@ -100,7 +100,7 @@ void __init mpc83xx_qe_init_IRQ(void) > if (!np) > return; > } > - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, qe_ic_cascade_high_mpic); > + qe_ic_init(np, 0, qe_ic_cascade_low, qe_ic_cascade_high); > of_node_put(np); > } > > diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c > index 7ee2c6628f64..2ed9e84ca03a 100644 > --- a/arch/powerpc/platforms/85xx/corenet_generic.c > +++ b/arch/powerpc/platforms/85xx/corenet_generic.c > @@ -50,8 +50,8 @@ void __init corenet_gen_pic_init(void) > > np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); > if (np) { > - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, > - qe_ic_cascade_high_mpic); > + qe_ic_init(np, 0, qe_ic_cascade_low, > + qe_ic_cascade_high); > of_node_put(np); > } > } > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c > index 5ca254256c47..24211a1787b2 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c > @@ -288,8 +288,8 @@ static void __init mpc85xx_mds_qeic_init(void) > } > > if (machine_is(p1021_mds)) > - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, > - qe_ic_cascade_high_mpic); > + qe_ic_init(np, 0, qe_ic_cascade_low, > + qe_ic_cascade_high); > else > qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL); > of_node_put(np); > diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > index d3c540ee558f..093867879081 100644 > --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c > @@ -66,8 +66,8 @@ void __init mpc85xx_rdb_pic_init(void) > #ifdef CONFIG_QUICC_ENGINE > np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); > if (np) { > - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, > - qe_ic_cascade_high_mpic); > + qe_ic_init(np, 0, qe_ic_cascade_low, > + qe_ic_cascade_high); > of_node_put(np); > > } else > diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c > index 720b0c0f03ba..2e0fb23854c0 100644 > --- a/arch/powerpc/platforms/85xx/twr_p102x.c > +++ b/arch/powerpc/platforms/85xx/twr_p102x.c > @@ -45,8 +45,8 @@ static void __init twr_p1025_pic_init(void) > #ifdef CONFIG_QUICC_ENGINE > np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); > if (np) { > - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, > - qe_ic_cascade_high_mpic); > + qe_ic_init(np, 0, qe_ic_cascade_low, > + qe_ic_cascade_high); > of_node_put(np); > } else > pr_err("Could not find qe-ic node\n"); > diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c > index 0ff802816c0c..f3659c312e13 100644 > --- a/drivers/soc/fsl/qe/qe_ic.c > +++ b/drivers/soc/fsl/qe/qe_ic.c > @@ -402,7 +402,7 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) > return irq_linear_revmap(qe_ic->irqhost, irq); > } > > -void qe_ic_cascade_low_mpic(struct irq_desc *desc) > +void qe_ic_cascade_low(struct irq_desc *desc) > { > struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); > unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); > @@ -415,7 +415,7 @@ void qe_ic_cascade_low_mpic(struct irq_desc *desc) > chip->irq_eoi(&desc->irq_data); > } > > -void qe_ic_cascade_high_mpic(struct irq_desc *desc) > +void qe_ic_cascade_high(struct irq_desc *desc) > { > struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); > unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); > diff --git a/include/soc/fsl/qe/qe_ic.h b/include/soc/fsl/qe/qe_ic.h > index fb10a7606acc..3c8220cedd9a 100644 > --- a/include/soc/fsl/qe/qe_ic.h > +++ b/include/soc/fsl/qe/qe_ic.h > @@ -74,8 +74,8 @@ void qe_ic_set_highest_priority(unsigned int virq, int high); > int qe_ic_set_priority(unsigned int virq, unsigned int priority); > int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high); > > -void qe_ic_cascade_low_mpic(struct irq_desc *desc); > -void qe_ic_cascade_high_mpic(struct irq_desc *desc); > +void qe_ic_cascade_low(struct irq_desc *desc); > +void qe_ic_cascade_high(struct irq_desc *desc); > void qe_ic_cascade_muxed_mpic(struct irq_desc *desc); > > #endif /* _ASM_POWERPC_QE_IC_H */ >
diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index 779791c0570f..835d082218ae 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -100,7 +100,7 @@ void __init mpc83xx_qe_init_IRQ(void) if (!np) return; } - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, qe_ic_cascade_high_mpic); + qe_ic_init(np, 0, qe_ic_cascade_low, qe_ic_cascade_high); of_node_put(np); } diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 7ee2c6628f64..2ed9e84ca03a 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -50,8 +50,8 @@ void __init corenet_gen_pic_init(void) np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); if (np) { - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); + qe_ic_init(np, 0, qe_ic_cascade_low, + qe_ic_cascade_high); of_node_put(np); } } diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 5ca254256c47..24211a1787b2 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -288,8 +288,8 @@ static void __init mpc85xx_mds_qeic_init(void) } if (machine_is(p1021_mds)) - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); + qe_ic_init(np, 0, qe_ic_cascade_low, + qe_ic_cascade_high); else qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL); of_node_put(np); diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index d3c540ee558f..093867879081 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -66,8 +66,8 @@ void __init mpc85xx_rdb_pic_init(void) #ifdef CONFIG_QUICC_ENGINE np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); if (np) { - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); + qe_ic_init(np, 0, qe_ic_cascade_low, + qe_ic_cascade_high); of_node_put(np); } else diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 720b0c0f03ba..2e0fb23854c0 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -45,8 +45,8 @@ static void __init twr_p1025_pic_init(void) #ifdef CONFIG_QUICC_ENGINE np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); if (np) { - qe_ic_init(np, 0, qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); + qe_ic_init(np, 0, qe_ic_cascade_low, + qe_ic_cascade_high); of_node_put(np); } else pr_err("Could not find qe-ic node\n"); diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c index 0ff802816c0c..f3659c312e13 100644 --- a/drivers/soc/fsl/qe/qe_ic.c +++ b/drivers/soc/fsl/qe/qe_ic.c @@ -402,7 +402,7 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) return irq_linear_revmap(qe_ic->irqhost, irq); } -void qe_ic_cascade_low_mpic(struct irq_desc *desc) +void qe_ic_cascade_low(struct irq_desc *desc) { struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic); @@ -415,7 +415,7 @@ void qe_ic_cascade_low_mpic(struct irq_desc *desc) chip->irq_eoi(&desc->irq_data); } -void qe_ic_cascade_high_mpic(struct irq_desc *desc) +void qe_ic_cascade_high(struct irq_desc *desc) { struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic); diff --git a/include/soc/fsl/qe/qe_ic.h b/include/soc/fsl/qe/qe_ic.h index fb10a7606acc..3c8220cedd9a 100644 --- a/include/soc/fsl/qe/qe_ic.h +++ b/include/soc/fsl/qe/qe_ic.h @@ -74,8 +74,8 @@ void qe_ic_set_highest_priority(unsigned int virq, int high); int qe_ic_set_priority(unsigned int virq, unsigned int priority); int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high); -void qe_ic_cascade_low_mpic(struct irq_desc *desc); -void qe_ic_cascade_high_mpic(struct irq_desc *desc); +void qe_ic_cascade_low(struct irq_desc *desc); +void qe_ic_cascade_high(struct irq_desc *desc); void qe_ic_cascade_muxed_mpic(struct irq_desc *desc); #endif /* _ASM_POWERPC_QE_IC_H */
The qe_ic_cascade_{low,high}_mpic functions are now used as handlers both when the interrupt parent is mpic as well as ipic, so remove the _mpic suffix. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- arch/powerpc/platforms/83xx/misc.c | 2 +- arch/powerpc/platforms/85xx/corenet_generic.c | 4 ++-- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 ++-- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 4 ++-- arch/powerpc/platforms/85xx/twr_p102x.c | 4 ++-- drivers/soc/fsl/qe/qe_ic.c | 4 ++-- include/soc/fsl/qe/qe_ic.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-)