[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 4/8] pseries: Cleanup duplications of ics_valid_irq()
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 4/8] pseries: Cleanup duplications of ics_valid_irq() code |
Date: |
Thu, 11 Oct 2012 21:47:40 +1000 |
A couple of places in xics.c open-coded the same logic as is already
implemented in ics_valid_irq(). This patch fixes the code duplication.
Signed-off-by: David Gibson <address@hidden>
---
hw/xics.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/xics.c b/hw/xics.c
index db01fe3..6b08430 100644
--- a/hw/xics.c
+++ b/hw/xics.c
@@ -326,8 +326,7 @@ static void ics_eoi(struct ics_state *ics, int nr)
qemu_irq xics_get_qirq(struct icp_state *icp, int irq)
{
- if ((irq < icp->ics->offset)
- || (irq >= (icp->ics->offset + icp->ics->nr_irqs))) {
+ if (!ics_valid_irq(icp->ics, irq)) {
return NULL;
}
@@ -336,8 +335,7 @@ qemu_irq xics_get_qirq(struct icp_state *icp, int irq)
void xics_set_irq_type(struct icp_state *icp, int irq, bool lsi)
{
- assert((irq >= icp->ics->offset)
- && (irq < (icp->ics->offset + icp->ics->nr_irqs)));
+ assert(ics_valid_irq(icp->ics, irq));
icp->ics->irqs[irq - icp->ics->offset].lsi = lsi;
}
--
1.7.10.4
- [Qemu-ppc] [0/8] Pending pseries patches, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 2/8] pseries: Clean up inconsistent variable name in xics.c, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 8/8] pseries: Add tracepoints to the XICS interrupt controller, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 5/8] pseries: Move XICS initialization before cpu initialization, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 4/8] pseries: Cleanup duplications of ics_valid_irq() code,
David Gibson <=
- [Qemu-ppc] [PATCH 6/8] pseries: Return the token when we register an RTAS call, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 3/8] pseries: Use #define for XICS base irq number, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 1/8] target-ppc: Extend FPU state for newer POWER CPUs, David Gibson, 2012/10/11
- [Qemu-ppc] [PATCH 7/8] pseries: Allow RTAS tokens without a qemu handler, David Gibson, 2012/10/11