genirq: Remove irq argument from irq flow handlers

[linux-drm-fsl-dcu.git] / drivers / gpio / gpio-altera.c

diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c
index 0f3d336d6303e9c4745f8da260ae5e7df8299805..1b44941574fa6965d68e474b9197907e71473692 100644 (file)
--- a/drivers/gpio/gpio-altera.c
+++ b/drivers/gpio/gpio-altera.c
@@ -201,8 +201,7 @@ static int altera_gpio_direction_output(struct gpio_chip *gc,
        return 0;
 }
 
-static void altera_gpio_irq_edge_handler(unsigned int irq,
-                                       struct irq_desc *desc)
+static void altera_gpio_irq_edge_handler(struct irq_desc *desc)
 {
        struct altera_gpio_chip *altera_gc;
        struct irq_chip *chip;
@@ -231,8 +230,7 @@ static void altera_gpio_irq_edge_handler(unsigned int irq,
 }
 
 
-static void altera_gpio_irq_leveL_high_handler(unsigned int irq,
-                                             struct irq_desc *desc)
+static void altera_gpio_irq_leveL_high_handler(struct irq_desc *desc)
 {
        struct altera_gpio_chip *altera_gc;
        struct irq_chip *chip;
@@ -338,9 +336,9 @@ static int altera_gpio_remove(struct platform_device *pdev)
 {
        struct altera_gpio_chip *altera_gc = platform_get_drvdata(pdev);
 
-       gpiochip_remove(&altera_gc->mmchip.gc);
+       of_mm_gpiochip_remove(&altera_gc->mmchip);
 
-       return -EIO;
+       return 0;
 }
 
 static const struct of_device_id altera_gpio_of_match[] = {