From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 22 Jan 2011 01:08:30 +0000 (+0100)
Subject: mfd: Fix ASIC3 build with GENERIC_HARDIRQS_NO_DEPRECATED
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a85b4827e9960295fbf4ca0f32bb357693cc5f7;p=openwrt%2Fstaging%2Fblogic.git

mfd: Fix ASIC3 build with GENERIC_HARDIRQS_NO_DEPRECATED

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 6a1f94042612..c45e6305b26f 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -143,9 +143,9 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
 	unsigned long flags;
 	struct asic3 *asic;
 
-	desc->chip->ack(irq);
+	desc->irq_data.chip->irq_ack(&desc->irq_data);
 
-	asic = desc->handler_data;
+	asic = get_irq_data(irq);
 
 	for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) {
 		u32 status;