gpio: siox: Use devm_ managed gpiochip

By using devm_gpiochip_add_data() we can get rid of the
remove() callback. As this driver doesn't use the
gpiochip data pointer we simply pass in NULL.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-siox.c b/drivers/gpio/gpio-siox.c
index c8cca30b2443ca6f805828bd4615839f33283210..006a7e6a75f21696543a436e2beaccfaef56715b 100644 (file)
--- a/drivers/gpio/gpio-siox.c
+++ b/drivers/gpio/gpio-siox.c
@@ -246,24 +246,15 @@ static int gpio_siox_probe(struct siox_device *sdevice)
        girq->default_type = IRQ_TYPE_NONE;
        girq->handler = handle_level_irq;
 
-       ret = gpiochip_add(&ddata->gchip);
+       ret = devm_gpiochip_add_data(dev, &ddata->gchip, NULL);
        if (ret)
                dev_err(dev, "Failed to register gpio chip (%d)\n", ret);
 
        return ret;
 }
 
-static int gpio_siox_remove(struct siox_device *sdevice)
-{
-       struct gpio_siox_ddata *ddata = dev_get_drvdata(&sdevice->dev);
-
-       gpiochip_remove(&ddata->gchip);
-       return 0;
-}
-
 static struct siox_driver gpio_siox_driver = {
        .probe = gpio_siox_probe,
-       .remove = gpio_siox_remove,
        .set_data = gpio_siox_set_data,
        .get_data = gpio_siox_get_data,
        .driver = {