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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
This commit is contained in:
Родитель
421e3c16c3
Коммит
7e55b33d3f
|
@ -64,34 +64,14 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
|
|||
ucb->gc.can_sleep = true;
|
||||
|
||||
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:
|
||||
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 = {
|
||||
.probe = ucb1400_gpio_probe,
|
||||
.remove = ucb1400_gpio_remove,
|
||||
.driver = {
|
||||
.name = "ucb1400_gpio"
|
||||
},
|
||||
|
|
|
@ -72,11 +72,9 @@ static int ucb1400_core_probe(struct device *dev)
|
|||
|
||||
/* GPIO */
|
||||
ucb_gpio.ac97 = ac97;
|
||||
if (pdata) {
|
||||
ucb_gpio.gpio_setup = pdata->gpio_setup;
|
||||
ucb_gpio.gpio_teardown = pdata->gpio_teardown;
|
||||
if (pdata)
|
||||
ucb_gpio.gpio_offset = pdata->gpio_offset;
|
||||
}
|
||||
|
||||
ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
|
||||
if (!ucb->ucb1400_gpio) {
|
||||
err = -ENOMEM;
|
||||
|
|
|
@ -84,8 +84,6 @@ struct ucb1400_gpio {
|
|||
struct gpio_chip gc;
|
||||
struct snd_ac97 *ac97;
|
||||
int gpio_offset;
|
||||
int (*gpio_setup)(struct device *dev, int ngpio);
|
||||
int (*gpio_teardown)(struct device *dev, int ngpio);
|
||||
};
|
||||
|
||||
struct ucb1400_ts {
|
||||
|
|
Загрузка…
Ссылка в новой задаче