]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
authorRobert Marko <robimarko@gmail.com>
Tue, 5 Mar 2024 14:20:33 +0000 (15:20 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 7 Mar 2024 04:39:29 +0000 (20:39 -0800)
Kernel bot has discovered that if CONFIG_GPIOLIB is not set compilation
will fail.

Upon investigation the issue is that qca807x_gpio() is guarded by a
preprocessor check but then it is called under
if (IS_ENABLED(CONFIG_GPIOLIB)) in the probe call so the compiler will
error out since qca807x_gpio() has not been declared if CONFIG_GPIOLIB has
not been set.

Fixes: d1cb613efbd3 ("net: phy: qcom: add support for QCA807x PHY Family")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202403031332.IGAbZzwq-lkp@intel.com/
Signed-off-by: Robert Marko <robimarko@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Simon Horman <horms@kernel.org> # build-tested
Link: https://lore.kernel.org/r/20240305142113.795005-1-robimarko@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/qcom/qca807x.c

index 780c28e2e4aa0746ee62e3d226f9cce248e3314b..672c6929119a62ae00f0075223b854d7a9d9652b 100644 (file)
@@ -732,24 +732,24 @@ static int qca807x_probe(struct phy_device *phydev)
        priv->dac_disable_bias_current_tweak = of_property_read_bool(node,
                                                                     "qcom,dac-disable-bias-current-tweak");
 
-       if (IS_ENABLED(CONFIG_GPIOLIB)) {
-               /* Make sure we don't have mixed leds node and gpio-controller
-                * to prevent registering leds and having gpio-controller usage
-                * conflicting with them.
-                */
-               if (of_find_property(node, "leds", NULL) &&
-                   of_find_property(node, "gpio-controller", NULL)) {
-                       phydev_err(phydev, "Invalid property detected. LEDs and gpio-controller are mutually exclusive.");
-                       return -EINVAL;
-               }
+#if IS_ENABLED(CONFIG_GPIOLIB)
+       /* Make sure we don't have mixed leds node and gpio-controller
+        * to prevent registering leds and having gpio-controller usage
+        * conflicting with them.
+        */
+       if (of_find_property(node, "leds", NULL) &&
+           of_find_property(node, "gpio-controller", NULL)) {
+               phydev_err(phydev, "Invalid property detected. LEDs and gpio-controller are mutually exclusive.");
+               return -EINVAL;
+       }
 
-               /* Do not register a GPIO controller unless flagged for it */
-               if (of_property_read_bool(node, "gpio-controller")) {
-                       ret = qca807x_gpio(phydev);
-                       if (ret)
-                               return ret;
-               }
+       /* Do not register a GPIO controller unless flagged for it */
+       if (of_property_read_bool(node, "gpio-controller")) {
+               ret = qca807x_gpio(phydev);
+               if (ret)
+                       return ret;
        }
+#endif
 
        /* Attach SFP bus on combo port*/
        if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {