| Message ID | 20240304192244.2924407-1-robimarko@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: phy: qca807x: fix compilation when CONFIG_GPIOLIB is not set | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/apply | fail | Patch does not apply to net-0 |
On Mon, Mar 04, 2024 at 08:21:36PM +0100, Robert Marko wrote: > - if (IS_ENABLED(CONFIG_GPIOLIB)) { > +#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. > @@ -749,7 +749,7 @@ static int qca807x_probe(struct phy_device *phydev) > if (ret) > return ret; > } > - } > +#endif I know it makes for a bigger patch, but #if is not equivalent to if() in terms of indentation, so the indentation also needs to be changed.
On Mon, 4 Mar 2024 at 20:27, Russell King (Oracle) <linux@armlinux.org.uk> wrote: > > On Mon, Mar 04, 2024 at 08:21:36PM +0100, Robert Marko wrote: > > - if (IS_ENABLED(CONFIG_GPIOLIB)) { > > +#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. > > @@ -749,7 +749,7 @@ static int qca807x_probe(struct phy_device *phydev) > > if (ret) > > return ret; > > } > > - } > > +#endif > > I know it makes for a bigger patch, but #if is not equivalent to if() > in terms of indentation, so the indentation also needs to be changed. Oh, sorry for that, it completely slipped my mind. I will fix it in v2, and will send it tomorrow afternoon to give others time to comment. Regards, Robert > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
diff --git a/drivers/net/phy/qcom/qca807x.c b/drivers/net/phy/qcom/qca807x.c index 780c28e2e4aa..62c01076b506 100644 --- a/drivers/net/phy/qcom/qca807x.c +++ b/drivers/net/phy/qcom/qca807x.c @@ -732,7 +732,7 @@ 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)) { +#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. @@ -749,7 +749,7 @@ static int qca807x_probe(struct phy_device *phydev) if (ret) return ret; } - } +#endif /* Attach SFP bus on combo port*/ if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
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> --- drivers/net/phy/qcom/qca807x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)