d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define irq variable only in the block where used.

Browse Source
This commit is contained in:
Svatopluk Kraus 2016-06-03 11:18:30 +00:00
parent 4d7f3703e2
commit 477ef5caf6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arm/arm/gic.c
View File

@ -1109,12 +1109,10 @@ arm_gic_setup_intr(device_t dev, struct intr_irqsrc *isrc,
{
struct arm_gic_softc *sc = device_get_softc(dev);
struct gic_irqsrc *gi = (struct gic_irqsrc *)isrc;
u_int irq;
enum intr_trigger trig;
enum intr_polarity pol;
if ((gi->gi_flags & GI_FLAG_MSI) == GI_FLAG_MSI) {
irq = gi->gi_irq;
pol = gi->gi_pol;
trig = gi->gi_trig;
KASSERT(pol == INTR_POLARITY_HIGH,
@ -1122,14 +1120,13 @@ arm_gic_setup_intr(device_t dev, struct intr_irqsrc *isrc,
KASSERT(trig == INTR_TRIGGER_EDGE,
("%s: MSI interrupts must be edge triggered", __func__));
} else if (data != NULL) {
/* Get config for resource. */
if (gic_map_intr(dev, data, &irq, &pol, &trig))
return (EINVAL);
u_int irq;
if (gi->gi_irq != irq)
/* Get config for resource. */
if (gic_map_intr(dev, data, &irq, &pol, &trig) ||
gi->gi_irq != irq)
return (EINVAL);
} else {
irq = gi->gi_irq;
pol = INTR_POLARITY_CONFORM;
trig = INTR_TRIGGER_CONFORM;
}