From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 15 Aug 2024 02:17:37 +0000 (-0700)
Subject: ath79: rb91x-key: use more devm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dedeb28755d6a9eb00d63e60f82e4334be09b9e4;p=openwrt%2Fstaging%2Fblocktrron.git

ath79: rb91x-key: use more devm

Use devm_gpiochip_add_data to get rid of the remove function. No need
for it.

Also use dev_err_probe to simplify the error path and avoid having to
handle -EPROBE_DEFER manually.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16506
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

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 8996b2a906..92e329e435 100644
--- a/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c
+++ b/target/linux/ath79/files/drivers/gpio/gpio-rb91x-key.c
@@ -145,7 +145,6 @@ static int gpio_rb91x_key_probe(struct platform_device *pdev)
 	struct gpio_chip *gc;
 	struct device *dev = &pdev->dev;
 	struct fwnode_handle *fwnode = dev->fwnode;
-	int r;
 
 	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
 	if (!drvdata)
@@ -155,13 +154,8 @@ static int gpio_rb91x_key_probe(struct platform_device *pdev)
 	mutex_init(&drvdata->poll_mutex);
 
 	drvdata->gpio = devm_gpiod_get(dev, NULL, GPIOD_OUT_LOW);
-	if (IS_ERR(drvdata->gpio)) {
-		if (PTR_ERR(drvdata->gpio) != -EPROBE_DEFER) {
-			dev_err(dev, "failed to get gpio: %ld\n",
-				PTR_ERR(drvdata->gpio));
-		}
-		return PTR_ERR(drvdata->gpio);
-	}
+	if (IS_ERR(drvdata->gpio))
+		return dev_err_probe(dev, PTR_ERR(drvdata->gpio), "failed to get gpio");
 
 	gc = &drvdata->gc;
 	gc->label = GPIO_RB91X_KEY_DRIVER_NAME;
@@ -176,21 +170,7 @@ static int gpio_rb91x_key_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, drvdata);
 
-	r = gpiochip_add(&drvdata->gc);
-	if (r) {
-		dev_err(dev, "gpiochip_add() failed: %d\n", r);
-		return r;
-	}
-
-	return 0;
-}
-
-static int gpio_rb91x_key_remove(struct platform_device *pdev)
-{
-	struct gpio_rb91x_key *drvdata = platform_get_drvdata(pdev);
-
-	gpiochip_remove(&drvdata->gc);
-	return 0;
+	return devm_gpiochip_add_data(dev, gc, drvdata);
 }
 
 static const struct of_device_id gpio_rb91x_key_match[] = {
@@ -202,7 +182,6 @@ MODULE_DEVICE_TABLE(of, gpio_rb91x_key_match);
 
 static struct platform_driver gpio_rb91x_key_driver = {
 	.probe = gpio_rb91x_key_probe,
-	.remove = gpio_rb91x_key_remove,
 	.driver = {
 		.name = GPIO_RB91X_KEY_DRIVER_NAME,
 		.owner = THIS_MODULE,