Merge branch 'topic/hda-ca0132-dsp' into for-next

[~andy/linux] / drivers / gpio / gpio-em.c

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 88bdfe37816f3250ce6d6b6ab35db4e0dd38b03f..bdc8302e711ab0cf59e9cbdfc6c0246be94c1c6a 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -233,7 +233,7 @@ static struct irq_domain_ops em_gio_irq_domain_ops = {
        .map    = em_gio_irq_domain_map,
 };
 
-static int __devinit em_gio_probe(struct platform_device *pdev)
+static int em_gio_probe(struct platform_device *pdev)
 {
        struct gpio_em_config *pdata = pdev->dev.platform_data;
        struct em_gio_priv *p;
@@ -302,8 +302,8 @@ static int __devinit em_gio_probe(struct platform_device *pdev)
        p->irq_domain = irq_domain_add_linear(pdev->dev.of_node,
                                              pdata->number_of_pins,
                                              &em_gio_irq_domain_ops, p);
-       if (!p->irq_domain)
-               err = -ENXIO;
+       if (!p->irq_domain) {
+               ret = -ENXIO;
                dev_err(&pdev->dev, "cannot initialize irq domain\n");
                goto err3;
        }
@@ -343,7 +343,7 @@ err0:
        return ret;
 }
 
-static int __devexit em_gio_remove(struct platform_device *pdev)
+static int em_gio_remove(struct platform_device *pdev)
 {
        struct em_gio_priv *p = platform_get_drvdata(pdev);
        struct resource *irq[2];
@@ -358,7 +358,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev)
 
        free_irq(irq[1]->start, pdev);
        free_irq(irq[0]->start, pdev);
-       em_gio_irq_domain_cleanup(p);
+       irq_domain_remove(p->irq_domain);
        iounmap(p->base1);
        iounmap(p->base0);
        kfree(p);
@@ -367,7 +367,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev)
 
 static struct platform_driver em_gio_device_driver = {
        .probe          = em_gio_probe,
-       .remove         = __devexit_p(em_gio_remove),
+       .remove         = em_gio_remove,
        .driver         = {
                .name   = "em_gio",
        }