summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/gpio/gpio-msic.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/gpio/gpio-msic.c')
-rw-r--r--kernel/drivers/gpio/gpio-msic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/drivers/gpio/gpio-msic.c b/kernel/drivers/gpio/gpio-msic.c
index 01acf0a8c..22523aae8 100644
--- a/kernel/drivers/gpio/gpio-msic.c
+++ b/kernel/drivers/gpio/gpio-msic.c
@@ -232,7 +232,7 @@ static struct irq_chip msic_irqchip = {
.irq_bus_sync_unlock = msic_bus_sync_unlock,
};
-static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void msic_gpio_irq_handler(struct irq_desc *desc)
{
struct irq_data *data = irq_desc_get_irq_data(desc);
struct msic_gpio *mg = irq_data_get_irq_handler_data(data);
@@ -309,8 +309,7 @@ static int platform_msic_gpio_probe(struct platform_device *pdev)
&msic_irqchip,
handle_simple_irq);
}
- irq_set_chained_handler(mg->irq, msic_gpio_irq_handler);
- irq_set_handler_data(mg->irq, mg);
+ irq_set_chained_handler_and_data(mg->irq, msic_gpio_irq_handler, mg);
return 0;
err: