* [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
@ 2024-03-05 14:20 Robert Marko
2024-03-05 16:03 ` Simon Horman
2024-03-07 4:50 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Robert Marko @ 2024-03-05 14:20 UTC (permalink / raw)
To: andersson, konrad.dybcio, andrew, hkallweit1, linux, davem,
edumazet, kuba, pabeni, ansuelsmth, linux-arm-msm, netdev,
linux-kernel
Cc: Robert Marko, kernel test robot
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>
---
Changes in v3:
* Target net-next tree
Changes in v2:
* Reduce the code indent level
drivers/net/phy/qcom/qca807x.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/phy/qcom/qca807x.c b/drivers/net/phy/qcom/qca807x.c
index 780c28e2e4aa..672c6929119a 100644
--- a/drivers/net/phy/qcom/qca807x.c
+++ b/drivers/net/phy/qcom/qca807x.c
@@ -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)) {
--
2.44.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
2024-03-05 14:20 [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set Robert Marko
@ 2024-03-05 16:03 ` Simon Horman
2024-03-07 4:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2024-03-05 16:03 UTC (permalink / raw)
To: Robert Marko
Cc: andersson, konrad.dybcio, andrew, hkallweit1, linux, davem,
edumazet, kuba, pabeni, ansuelsmth, linux-arm-msm, netdev,
linux-kernel, kernel test robot
On Tue, Mar 05, 2024 at 03:20:33PM +0100, Robert Marko wrote:
> 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>
> ---
> Changes in v3:
> * Target net-next tree
> Changes in v2:
> * Reduce the code indent level
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Simon Horman <horms@kernel.org> # build-tested
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
2024-03-05 14:20 [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set Robert Marko
2024-03-05 16:03 ` Simon Horman
@ 2024-03-07 4:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-03-07 4:50 UTC (permalink / raw)
To: Robert Marko
Cc: andersson, konrad.dybcio, andrew, hkallweit1, linux, davem,
edumazet, kuba, pabeni, ansuelsmth, linux-arm-msm, netdev,
linux-kernel, lkp
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 5 Mar 2024 15:20:33 +0100 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- [net-next,v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set
https://git.kernel.org/netdev/net-next/c/1677293ed891
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-07 4:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-05 14:20 [PATCH net-next v3] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set Robert Marko
2024-03-05 16:03 ` Simon Horman
2024-03-07 4:50 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.