summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/asic3.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2011-01-22 02:08:30 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-02 10:57:49 +0100
commit0a85b4827e9960295fbf4ca0f32bb357693cc5f7 (patch)
treeb5d284393ae96be646c8ba0a8c79e7762413f190 /drivers/mfd/asic3.c
parentdd9c1549edef02290edced639f67b54a25abbe0e (diff)
downloadop-kernel-dev-0a85b4827e9960295fbf4ca0f32bb357693cc5f7.zip
op-kernel-dev-0a85b4827e9960295fbf4ca0f32bb357693cc5f7.tar.gz
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>
Diffstat (limited to 'drivers/mfd/asic3.c')
-rw-r--r--drivers/mfd/asic3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 6a1f940..c45e630 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;
OpenPOWER on IntegriCloud