Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 26 May 2009 17:50:51 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r192822 - projects/mips/sys/mips/atheros
Message-ID:  <200905261750.n4QHopuP067338@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gonzo
Date: Tue May 26 17:50:50 2009
New Revision: 192822
URL: http://svn.freebsd.org/changeset/base/192822

Log:
  - style(9) fixes
  - Get rid of obsolete mask_fn

Modified:
  projects/mips/sys/mips/atheros/apb.c
  projects/mips/sys/mips/atheros/ar71xx_pci.c

Modified: projects/mips/sys/mips/atheros/apb.c
==============================================================================
--- projects/mips/sys/mips/atheros/apb.c	Tue May 26 17:43:32 2009	(r192821)
+++ projects/mips/sys/mips/atheros/apb.c	Tue May 26 17:50:50 2009	(r192822)
@@ -70,8 +70,10 @@ static int	apb_setup_intr(device_t, devi
 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 ir
 
 }
 
-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 ch
 	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 ch
 	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
 	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)

Modified: projects/mips/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xx_pci.c	Tue May 26 17:43:32 2009	(r192821)
+++ projects/mips/sys/mips/atheros/ar71xx_pci.c	Tue May 26 17:50:50 2009	(r192822)
@@ -80,18 +80,22 @@ static int ar71xx_pci_teardown_intr(devi
 		    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, devi
 	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, devi
 	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, d
 	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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905261750.n4QHopuP067338>