Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: exar: use devm action for freeing the IDA and drop remove()

Browse Source 
We can simplify the error path in probe() and drop remove() entirely if
we provide a devm action for freeing the device ID.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Bartosz Golaszewski 2020-10-20 09:24:04 +02:00
parent 36fb7218e8
commit 5300ebb695
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpio/gpio-exar.c
View File

@ -111,6 +111,13 @@ static int exar_direction_input(struct gpio_chip *chip, unsigned int offset)
return 0; return 0;
} }
static void exar_devm_ida_free(void *data)
{
struct exar_gpio_chip *exar_gpio = data;
ida_free(&ida_index, exar_gpio->index);
}
static const struct regmap_config exar_regmap_config = { static const struct regmap_config exar_regmap_config = {
.name = "exar-gpio", .name = "exar-gpio",
.reg_bits = 16, .reg_bits = 16,
@ -158,6 +165,10 @@ static int gpio_exar_probe(struct platform_device *pdev)
if (index < 0) if (index < 0)
return index; return index;
ret = devm_add_action_or_reset(dev, exar_devm_ida_free, exar_gpio);
if (ret)
return ret;
sprintf(exar_gpio->name, "exar_gpio%d", index); sprintf(exar_gpio->name, "exar_gpio%d", index);
exar_gpio->gpio_chip.label = exar_gpio->name; exar_gpio->gpio_chip.label = exar_gpio->name;
exar_gpio->gpio_chip.parent = dev; exar_gpio->gpio_chip.parent = dev;
@ -173,29 +184,15 @@ static int gpio_exar_probe(struct platform_device *pdev)
ret = devm_gpiochip_add_data(dev, &exar_gpio->gpio_chip, exar_gpio); ret = devm_gpiochip_add_data(dev, &exar_gpio->gpio_chip, exar_gpio);
if (ret) if (ret)
goto err_destroy; return ret;
platform_set_drvdata(pdev, exar_gpio); platform_set_drvdata(pdev, exar_gpio);
return 0;
err_destroy:
ida_free(&ida_index, index);
return ret;
}
static int gpio_exar_remove(struct platform_device *pdev)
{
struct exar_gpio_chip *exar_gpio = platform_get_drvdata(pdev);
ida_free(&ida_index, exar_gpio->index);
return 0; return 0;
} }
static struct platform_driver gpio_exar_driver = { static struct platform_driver gpio_exar_driver = {
.probe = gpio_exar_probe, .probe = gpio_exar_probe,
.remove = gpio_exar_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
}, },