mirror of https://github.com/xemu-project/xemu.git
pseries: Cleanup duplications of ics_valid_irq() code
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 <david@gibson.dropbear.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
bf0175de6c
commit
1ecbbab469
|
@ -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)
|
qemu_irq xics_get_qirq(struct icp_state *icp, int irq)
|
||||||
{
|
{
|
||||||
if ((irq < icp->ics->offset)
|
if (!ics_valid_irq(icp->ics, irq)) {
|
||||||
|| (irq >= (icp->ics->offset + icp->ics->nr_irqs))) {
|
|
||||||
return NULL;
|
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)
|
void xics_set_irq_type(struct icp_state *icp, int irq, bool lsi)
|
||||||
{
|
{
|
||||||
assert((irq >= icp->ics->offset)
|
assert(ics_valid_irq(icp->ics, irq));
|
||||||
&& (irq < (icp->ics->offset + icp->ics->nr_irqs)));
|
|
||||||
|
|
||||||
icp->ics->irqs[irq - icp->ics->offset].lsi = lsi;
|
icp->ics->irqs[irq - icp->ics->offset].lsi = lsi;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue