diff options
| author | Rosen Penev | 2024-10-04 20:20:13 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-10-08 17:35:56 +0000 |
| commit | 084665698b113811c8c9017631068dc3e452efa4 (patch) | |
| tree | deba03664edc22d1db720862a18e8c1f7752f497 | |
| parent | a35bfa68d3609cd50a92bfc132d5618d05017442 (diff) | |
| download | openwrt-084665698b113811c8c9017631068dc3e452efa4.tar.gz | |
ath79: gpio-rb91x-key: use devm for mutex_init
mutex_destroy is not called in any error paths or in _remove. Just use
devm to do so.
Removed a pointless platform_set_devdata call. Not needed with all of
the devm conversions.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16630
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c index 4b21c93469..b2c8e63305 100644 --- a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c +++ b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c @@ -144,13 +144,19 @@ static int gpio_rb91x_key_probe(struct platform_device *pdev) struct gpio_rb91x_key *drvdata; struct gpio_chip *gc; struct device *dev = &pdev->dev; + int err; drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - mutex_init(&drvdata->mutex); - mutex_init(&drvdata->poll_mutex); + err = devm_mutex_init(dev, &drvdata->mutex); + if (err) + return err; + + err = devm_mutex_init(dev, &drvdata->poll_mutex); + if (err) + return err; drvdata->gpio = devm_gpiod_get(dev, NULL, GPIOD_OUT_LOW); if (IS_ERR(drvdata->gpio)) @@ -167,8 +173,6 @@ static int gpio_rb91x_key_probe(struct platform_device *pdev) gc->direction_output = gpio_rb91x_key_direction_output; gc->direction_input = gpio_rb91x_key_direction_input; - platform_set_drvdata(pdev, drvdata); - return devm_gpiochip_add_data(dev, gc, drvdata); } |