Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...

[deliverable/linux.git] / drivers / mfd / asic3.c

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 9fc4186d41328af729beb99cb30488a89b64d937..120df5c08741a1b0f2fe53ca592fae2d7fd94ee2 100644 (file)
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -417,9 +417,8 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
        asic3_write_register(asic, ASIC3_OFFSET(INTR, INT_MASK),
                             ASIC3_INTMASK_GINTMASK);
 
-       irq_set_chained_handler(asic->irq_nr, asic3_irq_demux);
+       irq_set_chained_handler_and_data(asic->irq_nr, asic3_irq_demux, asic);
        irq_set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
-       irq_set_handler_data(asic->irq_nr, asic);
 
        return 0;
 }
@@ -605,7 +604,8 @@ static int asic3_gpio_remove(struct platform_device *pdev)
 {
        struct asic3 *asic = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&asic->gpio);
+       gpiochip_remove(&asic->gpio);
+       return 0;
 }
 
 static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)