[net] net: dsa: mt7530: don't build GPIO support if !GPIOLIB
diff mbox series

Message ID 20210226063226.8474-1-dqfext@gmail.com
State Accepted
Commit 63c75c053b4160f7b90a418dcc4e5bcfac2fb6fc
Headers show
Series
  • [net] net: dsa: mt7530: don't build GPIO support if !GPIOLIB
Related show

Commit Message

DENG Qingfang Feb. 26, 2021, 6:32 a.m. UTC
The new GPIO support may be optional at runtime, but it requires
building against gpiolib:

ERROR: modpost: "gpiochip_get_data" [drivers/net/dsa/mt7530.ko]
undefined!
ERROR: modpost: "devm_gpiochip_add_data_with_key"
[drivers/net/dsa/mt7530.ko] undefined!

Add #ifdef to exclude GPIO support if GPIOLIB is not enabled.

Fixes: 429a0edeefd8 ("net: dsa: mt7530: MT7530 optional GPIO support")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: DENG Qingfang <dqfext@gmail.com>
---
 drivers/net/dsa/mt7530.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Feb. 26, 2021, 11:40 p.m. UTC | #1
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Fri, 26 Feb 2021 14:32:26 +0800 you wrote:
> The new GPIO support may be optional at runtime, but it requires
> building against gpiolib:
> 
> ERROR: modpost: "gpiochip_get_data" [drivers/net/dsa/mt7530.ko]
> undefined!
> ERROR: modpost: "devm_gpiochip_add_data_with_key"
> [drivers/net/dsa/mt7530.ko] undefined!
> 
> [...]

Here is the summary with links:
  - [net] net: dsa: mt7530: don't build GPIO support if !GPIOLIB
    https://git.kernel.org/netdev/net/c/63c75c053b41

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Patch
diff mbox series

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index c17de2bcf2fe..f06f5fa2f898 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1624,6 +1624,7 @@  mtk_get_tag_protocol(struct dsa_switch *ds, int port,
 	}
 }
 
+#ifdef CONFIG_GPIOLIB
 static inline u32
 mt7530_gpio_to_bit(unsigned int offset)
 {
@@ -1726,6 +1727,7 @@  mt7530_setup_gpio(struct mt7530_priv *priv)
 
 	return devm_gpiochip_add_data(dev, gc, priv);
 }
+#endif /* CONFIG_GPIOLIB */
 
 static int
 mt7530_setup(struct dsa_switch *ds)
@@ -1868,11 +1870,13 @@  mt7530_setup(struct dsa_switch *ds)
 		}
 	}
 
+#ifdef CONFIG_GPIOLIB
 	if (of_property_read_bool(priv->dev->of_node, "gpio-controller")) {
 		ret = mt7530_setup_gpio(priv);
 		if (ret)
 			return ret;
 	}
+#endif /* CONFIG_GPIOLIB */
 
 	mt7530_setup_port5(ds, interface);