| Message ID | 20191025124058.22580-18-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 : > Now that the references from arch/powerpc/ are gone, these are only > referenced from inside qe_ic.c, so make them static. Why do that in two steps ? I think patch 9 could remain until here, and then you could squash patch 9 and patch 17 together here. Christophe > > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > --- > drivers/soc/fsl/qe/qe_ic.c | 6 +++--- > include/soc/fsl/qe/qe_ic.h | 4 ---- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c > index 545eb67094d1..e20f1205c0df 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(struct irq_desc *desc) > +static 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(struct irq_desc *desc) > chip->irq_eoi(&desc->irq_data); > } > > -void qe_ic_cascade_high(struct irq_desc *desc) > +static 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); > @@ -428,7 +428,7 @@ void qe_ic_cascade_high(struct irq_desc *desc) > chip->irq_eoi(&desc->irq_data); > } > > -void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) > +static void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) > { > struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); > unsigned int cascade_irq; > diff --git a/include/soc/fsl/qe/qe_ic.h b/include/soc/fsl/qe/qe_ic.h > index 8ec21a3bd859..43e4ce95c6a0 100644 > --- a/include/soc/fsl/qe/qe_ic.h > +++ b/include/soc/fsl/qe/qe_ic.h > @@ -67,8 +67,4 @@ 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(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 */ >
On 30/10/2019 11.50, Christophe Leroy wrote: > > > Le 25/10/2019 à 14:40, Rasmus Villemoes a écrit : >> Now that the references from arch/powerpc/ are gone, these are only >> referenced from inside qe_ic.c, so make them static. > > Why do that in two steps ? > I think patch 9 could remain until here, and then you could squash patch > 9 and patch 17 together here. Agreed, I should rearrange stuff to avoid touching the same lines again and again. Thanks, Rasmus
diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c index 545eb67094d1..e20f1205c0df 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(struct irq_desc *desc) +static 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(struct irq_desc *desc) chip->irq_eoi(&desc->irq_data); } -void qe_ic_cascade_high(struct irq_desc *desc) +static 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); @@ -428,7 +428,7 @@ void qe_ic_cascade_high(struct irq_desc *desc) chip->irq_eoi(&desc->irq_data); } -void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) +static void qe_ic_cascade_muxed_mpic(struct irq_desc *desc) { struct qe_ic *qe_ic = irq_desc_get_handler_data(desc); unsigned int cascade_irq; diff --git a/include/soc/fsl/qe/qe_ic.h b/include/soc/fsl/qe/qe_ic.h index 8ec21a3bd859..43e4ce95c6a0 100644 --- a/include/soc/fsl/qe/qe_ic.h +++ b/include/soc/fsl/qe/qe_ic.h @@ -67,8 +67,4 @@ 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(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 */
Now that the references from arch/powerpc/ are gone, these are only referenced from inside qe_ic.c, so make them static. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- drivers/soc/fsl/qe/qe_ic.c | 6 +++--- include/soc/fsl/qe/qe_ic.h | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-)