Message ID | 1466704050-15108-5-git-send-email-nikunj@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Jun 23, 2016 at 11:17:23PM +0530, Nikunj A Dadhania wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> This stands on its own so I've applied it to ppc-for-2.7 (adjusting for context conflicts, obviously). > --- > 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 40969ee..4f15a2d 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -695,17 +695,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); > -} > - > static void xics_register_types(void) > { > type_register_static(&xics_common_info); > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 32ea706..2a9b91d 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -170,7 +170,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, > Error **errp); > int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi,
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 40969ee..4f15a2d 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -695,17 +695,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); -} - static void xics_register_types(void) { type_register_static(&xics_common_info); diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 32ea706..2a9b91d 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -170,7 +170,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, Error **errp); int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi,