From: Colin Cross <ccross@android.com>
Date: Sat, 9 Apr 2011 00:26:06 +0000 (-0700)
Subject: ARM: common: fiq_debugger: Fix build for 2.6.39 irq changes
X-Git-Tag: firefly_0821_release~7613^2~646
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=999853b973f813a095bb78005c70f2c15a58d8ff;p=firefly-linux-kernel-4.4.55.git

ARM: common: fiq_debugger: Fix build for 2.6.39 irq changes

Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I68147c0a17f9cd1b7693826754edc55b1bb09592
---

diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index f172c15f1d3e..080f69edd75a 100644
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -136,9 +136,9 @@ static void debug_force_irq(struct fiq_debugger_state *state)
 	if (state->pdata->force_irq)
 		state->pdata->force_irq(state->pdev, irq);
 	else {
-		struct irq_chip *chip = get_irq_chip(irq);
-		if (chip && chip->retrigger)
-			chip->retrigger(irq);
+		struct irq_chip *chip = irq_get_chip(irq);
+		if (chip && chip->irq_retrigger)
+			chip->irq_retrigger(irq_get_irq_data(irq));
 	}
 }
 
@@ -340,7 +340,7 @@ static void dump_irqs(struct fiq_debugger_state *state)
 		debug_printf(state, "%5d: %10u %11u %8x  %s\n", n,
 			kstat_irqs(n),
 			kstat_irqs(n) - state->last_irqs[n],
-			irq_desc[n].status,
+			irq_desc[n].status_use_accessors,
 			(act && act->name) ? act->name : "???");
 		state->last_irqs[n] = kstat_irqs(n);
 	}