Commit 7e55b33d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bartosz Golaszewski

gpio: ucb1400: Remove platform setup and teardown support

There is no user of these callbacks. The motivation for this change is
to stop returning an error code from the remove callback.

This is a preparation for making platform remove callbacks return void.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 421e3c16
...@@ -64,34 +64,14 @@ static int ucb1400_gpio_probe(struct platform_device *dev) ...@@ -64,34 +64,14 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
ucb->gc.can_sleep = true; ucb->gc.can_sleep = true;
err = devm_gpiochip_add_data(&dev->dev, &ucb->gc, ucb); err = devm_gpiochip_add_data(&dev->dev, &ucb->gc, ucb);
if (err)
goto err;
if (ucb->gpio_setup)
err = ucb->gpio_setup(&dev->dev, ucb->gc.ngpio);
err: err:
return err; return err;
} }
static int ucb1400_gpio_remove(struct platform_device *dev)
{
int err = 0;
struct ucb1400_gpio *ucb = platform_get_drvdata(dev);
if (ucb && ucb->gpio_teardown) {
err = ucb->gpio_teardown(&dev->dev, ucb->gc.ngpio);
if (err)
return err;
}
return err;
}
static struct platform_driver ucb1400_gpio_driver = { static struct platform_driver ucb1400_gpio_driver = {
.probe = ucb1400_gpio_probe, .probe = ucb1400_gpio_probe,
.remove = ucb1400_gpio_remove,
.driver = { .driver = {
.name = "ucb1400_gpio" .name = "ucb1400_gpio"
}, },
......
...@@ -72,11 +72,9 @@ static int ucb1400_core_probe(struct device *dev) ...@@ -72,11 +72,9 @@ static int ucb1400_core_probe(struct device *dev)
/* GPIO */ /* GPIO */
ucb_gpio.ac97 = ac97; ucb_gpio.ac97 = ac97;
if (pdata) { if (pdata)
ucb_gpio.gpio_setup = pdata->gpio_setup;
ucb_gpio.gpio_teardown = pdata->gpio_teardown;
ucb_gpio.gpio_offset = pdata->gpio_offset; ucb_gpio.gpio_offset = pdata->gpio_offset;
}
ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1); ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
if (!ucb->ucb1400_gpio) { if (!ucb->ucb1400_gpio) {
err = -ENOMEM; err = -ENOMEM;
......
...@@ -84,8 +84,6 @@ struct ucb1400_gpio { ...@@ -84,8 +84,6 @@ struct ucb1400_gpio {
struct gpio_chip gc; struct gpio_chip gc;
struct snd_ac97 *ac97; struct snd_ac97 *ac97;
int gpio_offset; int gpio_offset;
int (*gpio_setup)(struct device *dev, int ngpio);
int (*gpio_teardown)(struct device *dev, int ngpio);
}; };
struct ucb1400_ts { struct ucb1400_ts {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment