| Message ID | 1447201710-10229-32-git-send-email-benh@kernel.crashing.org |
|---|---|
| State | New |
| Headers | show |
On Wed, Nov 11, 2015 at 11:27:44AM +1100, Benjamin Herrenschmidt wrote: > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> In fact, this is a sufficiently good clean up that I think I'll merge it shortly, regardless of what happens with the rest of the pnv series. > --- > hw/intc/xics.c | 11 ----------- > include/hw/ppc/xics.h | 1 - > 2 files changed, 12 deletions(-) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 165ff0b..197df33 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -678,17 +678,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) > lsi ? XICS_FLAGS_IRQ_LSI : XICS_FLAGS_IRQ_MSI; > } > > -void xics_set_irq_type(XICSState *icp, int irq, bool lsi) > -{ > - int src = xics_find_source(icp, irq); > - ICSState *ics; > - > - assert(src >= 0); > - > - ics = &icp->ics[src]; > - ics_set_irq_type(ics, irq - ics->offset, lsi); > -} > - > /* > * XICS > */ > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index ad39c8c..8e7998f 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -166,7 +166,6 @@ struct ICSIRQState { > #define XICS_IRQS_SPAPR 1024 > > qemu_irq xics_get_qirq(XICSState *icp, int irq); > -void xics_set_irq_type(XICSState *icp, int irq, bool lsi); > > int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi); > int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align);
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 165ff0b..197df33 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -678,17 +678,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) lsi ? XICS_FLAGS_IRQ_LSI : XICS_FLAGS_IRQ_MSI; } -void xics_set_irq_type(XICSState *icp, int irq, bool lsi) -{ - int src = xics_find_source(icp, irq); - ICSState *ics; - - assert(src >= 0); - - ics = &icp->ics[src]; - ics_set_irq_type(ics, irq - ics->offset, lsi); -} - /* * XICS */ diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index ad39c8c..8e7998f 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -166,7 +166,6 @@ struct ICSIRQState { #define XICS_IRQS_SPAPR 1024 qemu_irq xics_get_qirq(XICSState *icp, int irq); -void xics_set_irq_type(XICSState *icp, int irq, bool lsi); int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi); int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align);
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- hw/intc/xics.c | 11 ----------- include/hw/ppc/xics.h | 1 - 2 files changed, 12 deletions(-)