diff options
author | Niklas Cassel <niklas.cassel@linaro.org> | 2018-10-31 11:08:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-31 21:35:58 -0400 |
commit | 30549aab146ccb1275230c3b4b4bc6b4181fd54e (patch) | |
tree | 7198a78c1a72fb34b9143b20d488e9d9b03d2c79 | |
parent | 4d3163cf873f628dc598d5e9a15911b198655a07 (diff) |
net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules
When building stmmac, it is only possible to select CONFIG_DWMAC_GENERIC,
or any of the glue drivers, when CONFIG_STMMAC_PLATFORM is set.
The only exception is CONFIG_STMMAC_PCI.
When calling of_mdiobus_register(), it will call our ->reset()
callback, which is set to stmmac_mdio_reset().
Most of the code in stmmac_mdio_reset() is protected by a
"#if defined(CONFIG_STMMAC_PLATFORM)", which will evaluate
to false when CONFIG_STMMAC_PLATFORM=m.
Because of this, the phy reset gpio will only be pulled when
stmmac is built as built-in, but not when built as modules.
Fix this by using "#if IS_ENABLED()" instead of "#if defined()".
Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index b72ef171477e..bdd351597b55 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | |||
@@ -243,7 +243,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, | |||
243 | */ | 243 | */ |
244 | int stmmac_mdio_reset(struct mii_bus *bus) | 244 | int stmmac_mdio_reset(struct mii_bus *bus) |
245 | { | 245 | { |
246 | #if defined(CONFIG_STMMAC_PLATFORM) | 246 | #if IS_ENABLED(CONFIG_STMMAC_PLATFORM) |
247 | struct net_device *ndev = bus->priv; | 247 | struct net_device *ndev = bus->priv; |
248 | struct stmmac_priv *priv = netdev_priv(ndev); | 248 | struct stmmac_priv *priv = netdev_priv(ndev); |
249 | unsigned int mii_address = priv->hw->mii.addr; | 249 | unsigned int mii_address = priv->hw->mii.addr; |