Skip to content

Commit

Permalink
net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
Browse files Browse the repository at this point in the history
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: d1cb613 ("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>
  • Loading branch information
Robert Marko authored and Jakub Kicinski committed Mar 7, 2024
1 parent 771d791 commit 1677293
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions drivers/net/phy/qcom/qca807x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 1677293

Please sign in to comment.