diff options
author | gonzo <gonzo@FreeBSD.org> | 2009-05-26 17:50:50 +0000 |
---|---|---|
committer | gonzo <gonzo@FreeBSD.org> | 2009-05-26 17:50:50 +0000 |
commit | 14ff8a23b4275553b6c8f27e4d1e9fc8b2eb86b9 (patch) | |
tree | cc774c47825993d9915890e4a6c590c8bc16e06b /sys | |
parent | 3e0e3d979607171e8987c1d6cd08696991dcbfc7 (diff) | |
download | FreeBSD-src-14ff8a23b4275553b6c8f27e4d1e9fc8b2eb86b9.zip FreeBSD-src-14ff8a23b4275553b6c8f27e4d1e9fc8b2eb86b9.tar.gz |
- style(9) fixes
- Get rid of obsolete mask_fn
Diffstat (limited to 'sys')
-rw-r--r-- | sys/mips/atheros/apb.c | 14 | ||||
-rw-r--r-- | sys/mips/atheros/ar71xx_pci.c | 16 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c index fad29ec..ee8a167 100644 --- a/sys/mips/atheros/apb.c +++ b/sys/mips/atheros/apb.c @@ -70,8 +70,10 @@ static int apb_setup_intr(device_t, device_t, struct resource *, int, static int apb_teardown_intr(device_t, device_t, struct resource *, void *); -static void apb_mask_irq(unsigned int irq) +static void +apb_mask_irq(void *source) { + unsigned int irq = (unsigned int)source; uint32_t reg; reg = ATH_READ_REG(AR71XX_MISC_INTR_MASK); @@ -79,9 +81,11 @@ static void apb_mask_irq(unsigned int irq) } -static void apb_unmask_irq(unsigned int irq) +static void +apb_unmask_irq(void *source) { uint32_t reg; + unsigned int irq = (unsigned int)source; reg = ATH_READ_REG(AR71XX_MISC_INTR_MASK); ATH_WRITE_REG(AR71XX_MISC_INTR_MASK, reg | (1 << irq)); @@ -277,7 +281,7 @@ apb_setup_intr(device_t bus, device_t child, struct resource *ires, event = sc->sc_eventstab[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, irq, - (mask_fn)apb_mask_irq, (mask_fn)apb_unmask_irq, + apb_mask_irq, apb_unmask_irq, NULL, NULL, "apb intr%d:", irq); @@ -287,7 +291,7 @@ apb_setup_intr(device_t bus, device_t child, struct resource *ires, intr_event_add_handler(event, device_get_nameunit(child), filt, handler, arg, intr_priority(flags), flags, cookiep); - apb_unmask_irq(irq); + apb_unmask_irq((void*)irq); return (0); } @@ -306,7 +310,7 @@ apb_teardown_intr(device_t dev, device_t child, struct resource *ires, if (sc->sc_eventstab[irq] == NULL) panic("Trying to teardown unoccupied IRQ"); - apb_mask_irq(irq); + apb_mask_irq((void*)irq); result = intr_event_remove_handler(cookie); if (!result) diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c index ee186b7..5a3697d 100644 --- a/sys/mips/atheros/ar71xx_pci.c +++ b/sys/mips/atheros/ar71xx_pci.c @@ -80,18 +80,22 @@ static int ar71xx_pci_teardown_intr(device_t, device_t, struct resource *, void *); static int ar71xx_pci_intr(void *); -static void ar71xx_pci_mask_irq(unsigned int irq) +static void +ar71xx_pci_mask_irq(void *source) { uint32_t reg; + unsigned int irq = (unsigned int)source; reg = ATH_READ_REG(AR71XX_PCI_INTR_MASK); ATH_WRITE_REG(AR71XX_PCI_INTR_MASK, reg & ~(1 << irq)); } -static void ar71xx_pci_unmask_irq(unsigned int irq) +static void +ar71xx_pci_unmask_irq(void *source) { uint32_t reg; + unsigned int irq = (unsigned int)source; reg = ATH_READ_REG(AR71XX_PCI_INTR_MASK); ATH_WRITE_REG(AR71XX_PCI_INTR_MASK, reg | (1 << irq)); @@ -426,9 +430,7 @@ ar71xx_pci_setup_intr(device_t bus, device_t child, struct resource *ires, event = sc->sc_eventstab[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, irq, - (mask_fn)ar71xx_pci_mask_irq, - (mask_fn)ar71xx_pci_unmask_irq, - NULL, NULL, + ar71xx_pci_mask_irq, ar71xx_pci_unmask_irq, NULL, NULL, "ar71xx_pci intr%d:", irq); sc->sc_eventstab[irq] = event; @@ -437,7 +439,7 @@ ar71xx_pci_setup_intr(device_t bus, device_t child, struct resource *ires, intr_event_add_handler(event, device_get_nameunit(child), filt, handler, arg, intr_priority(flags), flags, cookiep); - ar71xx_pci_unmask_irq(irq); + ar71xx_pci_unmask_irq((void*)irq); return (0); } @@ -456,7 +458,7 @@ ar71xx_pci_teardown_intr(device_t dev, device_t child, struct resource *ires, if (sc->sc_eventstab[irq] == NULL) panic("Trying to teardown unoccupied IRQ"); - ar71xx_pci_mask_irq(irq); + ar71xx_pci_mask_irq((void*)irq); result = intr_event_remove_handler(cookie); if (!result) |