svn commit: r276022 - projects/arm_intrng/sys/arm/ti

[Andrew Turner]

Author: andrew
Date: Sun Dec 21 16:49:42 2014
New Revision: 276022
URL: https://svnweb.freebsd.org/changeset/base/276022

Log:
  Add proper guards to the read/write macros and fix a mismerge

Modified:
  projects/arm_intrng/sys/arm/ti/aintc.c

Modified: projects/arm_intrng/sys/arm/ti/aintc.c
==============================================================================
--- projects/arm_intrng/sys/arm/ti/aintc.c	Sun Dec 21 16:48:57 2014	(r276021)
+++ projects/arm_intrng/sys/arm/ti/aintc.c	Sun Dec 21 16:49:42 2014	(r276022)
@@ -73,10 +73,10 @@ static struct resource_spec ti_aintc_spe
 	{ -1, 0 }
 };
 
-#define	aintc_read_4(_sc,reg)		\
-    bus_space_read_4(_sc->aintc_bst, _sc->aintc_bsh, (reg))
+#define	aintc_read_4(_sc, reg)		\
+    bus_space_read_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg))
 #define	aintc_write_4(_sc, reg, val)		\
-    bus_space_write_4(_sc->aintc_bst, _sc->aintc_bsh, (reg), (val))
+    bus_space_write_4((_sc)->aintc_bst, (_sc)->aintc_bsh, (reg), (val))
 
 static int ti_aintc_probe(device_t);
 static int ti_aintc_attach(device_t);
@@ -191,6 +191,7 @@ ti_aintc_unmask(device_t dev, int irq)
 
 	aintc_write_4(sc, INTC_MIR_CLEAR(irq >> 5), (1UL << (irq & 0x1F)));
 	arm_irq_memory_barrier(nb);
+}
 
 static void
 ti_aintc_eoi(device_t dev, int irq)
@@ -201,6 +202,3 @@ ti_aintc_eoi(device_t dev, int irq)
 	    1UL << (irq & 0x1F));
 	aintc_write_4(sc, INTC_CONTROL,1);
 }
-
-	aintc_write_4(INTC_MIR_CLEAR(nb >> 5), (1UL << (nb & 0x1F)));
-}