]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: davinci-mcasp: remove unneeded #ifdef
authorBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Fri, 5 Dec 2025 09:05:34 +0000 (10:05 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 14 Dec 2025 10:37:33 +0000 (19:37 +0900)
The enablement of the CONFIG_OF_GPIO switch has nothing to do with the
"gpio-controller" property which may as well come from software nodes
and GPIOLIB can still be enabled separately.

This driver does not call any symbols from gpiolib-of.h so has no need
to check this option at all. Just use the generic device property
accessor.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Link: https://patch.msgid.link/20251205090534.27845-1-bartosz.golaszewski@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/davinci-mcasp.c

index 621a9d5f9377a50b6ba29c1694d8e85faaec44d1..db6913c0537897834eb8be26c144470762d4e259 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/math64.h>
 #include <linux/bitmap.h>
 #include <linux/gpio/driver.h>
+#include <linux/property.h>
 
 #include <sound/asoundef.h>
 #include <sound/core.h>
@@ -1875,11 +1876,7 @@ err1:
 
 static bool davinci_mcasp_have_gpiochip(struct davinci_mcasp *mcasp)
 {
-#ifdef CONFIG_OF_GPIO
-       return of_property_read_bool(mcasp->dev->of_node, "gpio-controller");
-#else
-       return false;
-#endif
+       return device_property_present(mcasp->dev, "gpio-controller");
 }
 
 static int davinci_mcasp_get_config(struct davinci_mcasp *mcasp,