Module Name: src
Committed By: skrll
Date: Mon May 21 20:58:39 UTC 2012
Modified Files:
src/sys/arch/hp700/dev: apic.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/dev/apic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/apic.c
diff -u src/sys/arch/hp700/dev/apic.c:1.14 src/sys/arch/hp700/dev/apic.c:1.15
--- src/sys/arch/hp700/dev/apic.c:1.14 Sat Apr 14 10:43:19 2012
+++ src/sys/arch/hp700/dev/apic.c Mon May 21 20:58:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: apic.c,v 1.14 2012/04/14 10:43:19 skrll Exp $ */
+/* $NetBSD: apic.c,v 1.15 2012/05/21 20:58:39 skrll Exp $ */
/* $OpenBSD: apic.c,v 1.14 2011/05/01 21:59:39 kettenis Exp $ */
@@ -141,7 +141,8 @@ apic_intr_map(const struct pci_attach_ar
if (sc->sc_irq[line] == 0)
sc->sc_irq[line] = hp700_intr_allocate_bit(&ir_cpu);
*ihp = (line << APIC_INT_LINE_SHIFT) | sc->sc_irq[line];
- return (APIC_INT_IRQ(*ihp) == 0);
+
+ return APIC_INT_IRQ(*ihp) == 0;
}
const char *
@@ -152,7 +153,7 @@ apic_intr_string(void *v, pci_intr_handl
snprintf(buf, sizeof(buf), "line %ld irq %ld",
APIC_INT_LINE(ih), APIC_INT_IRQ(ih));
- return (buf);
+ return buf;
}
void *
@@ -172,7 +173,7 @@ apic_intr_establish(void *v, pci_intr_ha
/* no mapping or bogus */
if (irq <= 0 || irq > 31)
- return (NULL);
+ return NULL;
aiv = malloc(sizeof(struct apic_iv), M_DEVBUF, M_NOWAIT);
if (aiv == NULL)
@@ -234,7 +235,7 @@ apic_intr_establish(void *v, pci_intr_ha
apic_intr_list[irq] = aiv;
- return (arg);
+ return arg;
}
void
@@ -262,7 +263,7 @@ apic_intr(void *v)
/* Signal EOI. */
elroy_write32(&r->apic_eoi, htole32((31 - irq) & APIC_ENT0_VEC));
- return (claimed);
+ return claimed;
}
void
