Skip to contentSkip to conversation

ASoC: pxa2xx-ac97: Use devm_gpiod_get_optional()

PATCH New Andy Shevchenko 1 participant 1 message Apr 15

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ASoC: pxa2xx-ac97: Use devm_gpiod_get_optional()

No need to open code the devm_gpiod_get_optional() wrapper. Instead of checking for a certain error code, check for NULL. This improves readability of the code.

---

v3: rebased on top of the latest changes to the driver
v2: added tag (Peng), rebased on top of latest ASoC tree

 sound/arm/pxa2xx-ac97-lib.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
sound/arm/pxa2xx-ac97-lib.c +6 -10
index 79eb557d4942..47889f6003c1 100644
@@ -330,16 +330,12 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
 
 	if (dev->dev.of_node) {
 		/* Assert reset using GPIOD_OUT_HIGH, because reset is GPIO_ACTIVE_LOW */
-		rst_gpio = devm_gpiod_get(&dev->dev, "reset", GPIOD_OUT_HIGH);
-		if (IS_ERR(rst_gpio)) {
-			ret = PTR_ERR(rst_gpio);
-			if (ret == -ENOENT)
-				reset_gpio = -1;
-			else if (ret)
-				return ret;
-		} else {
-			reset_gpio = desc_to_gpio(rst_gpio);
-		}
+		rst_gpio = devm_gpiod_get_optional(&dev->dev, "reset", GPIOD_OUT_HIGH);
+		ret = PTR_ERR(rst_gpio);
+		if (ret)
+			return ret;
+
+		reset_gpio = rst_gpio ? desc_to_gpio(rst_gpio) : -1;
 	} else {
 		if (cpu_is_pxa27x())
 			reset_gpio = 113;
Signature · 1 line
2.50.1