svn commit: r271594 - head/sys/arm/arm

[Ian Lepore]

Author: ian
Date: Sun Sep 14 17:36:57 2014
New Revision: 271594
URL: http://svnweb.freebsd.org/changeset/base/271594

Log:
  Fix an undefined variable that was accidentally not causing an error.
  
  The code had references to both intr_offset and intr_parent variable names
  as referring to the parent interrupt node.  The intr_parent variable
  wasn't actually defined anywhere, but the only references to it were as
  an argument to a macro that didn't use that argument in expansion, so
  the undefined variable accidentally didn't cause an error.
  
  The intr_parent name makes more sense in context, so change all occurrances
  of intr_offset to intr_parent.

Modified:
  head/sys/arm/arm/nexus.c

Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c	Sun Sep 14 16:46:30 2014	(r271593)
+++ head/sys/arm/arm/nexus.c	Sun Sep 14 17:36:57 2014	(r271594)
@@ -356,16 +356,16 @@ nexus_ofw_map_intr(device_t dev, device_
     pcell_t *intr)
 {
 	fdt_pic_decode_t intr_decode;
-	phandle_t intr_offset;
+	phandle_t intr_parent;
 	int i, rv, interrupt, trig, pol;
 
-	intr_offset = OF_node_from_xref(iparent);
+	intr_parent = OF_node_from_xref(iparent);
 	for (i = 0; i < icells; i++)
 		intr[i] = cpu_to_fdt32(intr[i]);
 
 	for (i = 0; fdt_pic_table[i] != NULL; i++) {
 		intr_decode = fdt_pic_table[i];
-		rv = intr_decode(intr_offset, intr, &interrupt, &trig, &pol);
+		rv = intr_decode(intr_parent, intr, &interrupt, &trig, &pol);
 
 		if (rv == 0) {
 			/* This was recognized as our PIC and decoded. */