locking/rwsem: Fix down_write_killable()

[deliverable/linux.git] / drivers / gpio / gpio-ts5500.c

diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c
index 5f945083f9d8c8f699fce925fe403e4ed54f626c..6cfeba07f8820aa858c637e947f5508af2aef05d 100644 (file)
--- a/drivers/gpio/gpio-ts5500.c
+++ b/drivers/gpio/gpio-ts5500.c
@@ -409,7 +409,7 @@ static int ts5500_dio_probe(struct platform_device *pdev)
                break;
        }
 
-       ret = gpiochip_add_data(&priv->gpio_chip, priv);
+       ret = devm_gpiochip_add_data(dev, &priv->gpio_chip, priv);
        if (ret) {
                dev_err(dev, "failed to register the gpio chip\n");
                return ret;
@@ -418,13 +418,10 @@ static int ts5500_dio_probe(struct platform_device *pdev)
        ret = ts5500_enable_irq(priv);
        if (ret) {
                dev_err(dev, "invalid interrupt %d\n", priv->hwirq);
-               goto cleanup;
+               return ret;
        }
 
        return 0;
-cleanup:
-       gpiochip_remove(&priv->gpio_chip);
-       return ret;
 }
 
 static int ts5500_dio_remove(struct platform_device *pdev)
@@ -432,7 +429,7 @@ static int ts5500_dio_remove(struct platform_device *pdev)
        struct ts5500_priv *priv = platform_get_drvdata(pdev);
 
        ts5500_disable_irq(priv);
-       gpiochip_remove(&priv->gpio_chip);
+
        return 0;
 }