mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set

Browse source 
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: d1cb613efb ("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>
This commit is contained in:
Robert Marko 2024-03-05 15:20:33 +01:00 committed by Jakub Kicinski
parent 771d791d7c
commit 1677293ed8
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/net/phy/qcom/qca807x.c
View file

@ -732,25 +732,25 @@ 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;
}
/* 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;
}
#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;
}
#endif
/* Attach SFP bus on combo port*/
if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
ret = phy_sfp_probe(phydev, &qca807x_sfp_ops);