ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 06:33:41 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

ath79: gpio-rb4xx: use devm_mutex_init

Browse Source 
Also use devm for gpiochip_add_data.

Allows completely removing the _remove function.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16622
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rosen Penev 2024-10-03 16:06:31 -07:00 committed by Robert Marko
parent b37f3def86
commit a35bfa68d3
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/linux/ath79/files/drivers/gpio/gpio-rb4xx.c
View File

@ -105,6 +105,7 @@ static int rb4xx_gpio_probe(struct platform_device *pdev)
struct device *parent = dev->parent; struct device *parent = dev->parent;
struct rb4xx_gpio *gpio; struct rb4xx_gpio *gpio;
u32 val; u32 val;
int err;
if (!parent) if (!parent)
return -ENODEV; return -ENODEV;
@ -117,7 +118,10 @@ static int rb4xx_gpio_probe(struct platform_device *pdev)
gpio->cpld = dev_get_drvdata(parent); gpio->cpld = dev_get_drvdata(parent);
gpio->dev = dev; gpio->dev = dev;
gpio->values = 0; gpio->values = 0;
mutex_init(&gpio->lock);
err = devm_mutex_init(&pdev->dev, &gpio->lock);
if (err)
return err;
gpio->chip.label = "rb4xx-gpio"; gpio->chip.label = "rb4xx-gpio";
gpio->chip.parent = dev; gpio->chip.parent = dev;
@ -134,17 +138,7 @@ static int rb4xx_gpio_probe(struct platform_device *pdev)
if (!of_property_read_u32(dev->of_node, "base", &val)) if (!of_property_read_u32(dev->of_node, "base", &val))
gpio->chip.base = val; gpio->chip.base = val;
return gpiochip_add_data(&gpio->chip, gpio); return devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);
}
static int rb4xx_gpio_remove(struct platform_device *pdev)
{
struct rb4xx_gpio *gpio = platform_get_drvdata(pdev);
gpiochip_remove(&gpio->chip);
mutex_destroy(&gpio->lock);
return 0;
} }
static const struct platform_device_id rb4xx_gpio_id_table[] = { static const struct platform_device_id rb4xx_gpio_id_table[] = {
@ -155,7 +149,6 @@ MODULE_DEVICE_TABLE(platform, rb4xx_gpio_id_table);
static struct platform_driver rb4xx_gpio_driver = { static struct platform_driver rb4xx_gpio_driver = {
.probe = rb4xx_gpio_probe, .probe = rb4xx_gpio_probe,
.remove = rb4xx_gpio_remove,
.id_table = rb4xx_gpio_id_table, .id_table = rb4xx_gpio_id_table,
.driver = { .driver = {
.name = "rb4xx-gpio", .name = "rb4xx-gpio",