Commit 63c75c05 authored by DENG Qingfang's avatar DENG Qingfang Committed by Jakub Kicinski

net: dsa: mt7530: don't build GPIO support if !GPIOLIB

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: 429a0ede ("net: dsa: mt7530: MT7530 optional GPIO support")
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDENG Qingfang <dqfext@gmail.com>
Link: https://lore.kernel.org/r/20210226063226.8474-1-dqfext@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 01c2c1ad
...@@ -1624,6 +1624,7 @@ mtk_get_tag_protocol(struct dsa_switch *ds, int port, ...@@ -1624,6 +1624,7 @@ mtk_get_tag_protocol(struct dsa_switch *ds, int port,
} }
} }
#ifdef CONFIG_GPIOLIB
static inline u32 static inline u32
mt7530_gpio_to_bit(unsigned int offset) mt7530_gpio_to_bit(unsigned int offset)
{ {
...@@ -1726,6 +1727,7 @@ mt7530_setup_gpio(struct mt7530_priv *priv) ...@@ -1726,6 +1727,7 @@ mt7530_setup_gpio(struct mt7530_priv *priv)
return devm_gpiochip_add_data(dev, gc, priv); return devm_gpiochip_add_data(dev, gc, priv);
} }
#endif /* CONFIG_GPIOLIB */
static int static int
mt7530_setup(struct dsa_switch *ds) mt7530_setup(struct dsa_switch *ds)
...@@ -1868,11 +1870,13 @@ 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")) { if (of_property_read_bool(priv->dev->of_node, "gpio-controller")) {
ret = mt7530_setup_gpio(priv); ret = mt7530_setup_gpio(priv);
if (ret) if (ret)
return ret; return ret;
} }
#endif /* CONFIG_GPIOLIB */
mt7530_setup_port5(ds, interface); mt7530_setup_port5(ds, interface);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment