diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-05 13:15:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-05 13:15:22 -0700 |
| commit | ba3823ca6a052d1aea2c7f7bf8ed6377f5f180e3 (patch) | |
| tree | 3761a270011f32dae3999c8f687490cca89c65b7 /drivers/net/phy/mscc | |
| parent | e22437207683a9099d5fb3a1b5cc8f5c7b24a583 (diff) | |
| parent | ae602786407fef34e1d66b3c8f278a10ed37197e (diff) | |
| download | linux-ba3823ca6a052d1aea2c7f7bf8ed6377f5f180e3.tar.gz linux-ba3823ca6a052d1aea2c7f7bf8ed6377f5f180e3.tar.bz2 linux-ba3823ca6a052d1aea2c7f7bf8ed6377f5f180e3.zip | |
Merge branch 'Fixes-for-OF_MDIO-flag'
Dan Murphy says:
====================
Fixes for OF_MDIO flag
There are some residual drivers that check the CONFIG_OF_MDIO flag using the
if defs. Using this check does not work when the OF_MDIO is configured as a
module. Using the IS_ENABLED macro checks if the flag is declared as built-in
or as a module.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/mscc')
| -rw-r--r-- | drivers/net/phy/mscc/mscc.h | 2 | ||||
| -rw-r--r-- | drivers/net/phy/mscc/mscc_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/mscc/mscc.h b/drivers/net/phy/mscc/mscc.h index f828c917b9f7..fbcee5fce7b2 100644 --- a/drivers/net/phy/mscc/mscc.h +++ b/drivers/net/phy/mscc/mscc.h @@ -374,7 +374,7 @@ struct vsc8531_private { #endif }; -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) struct vsc8531_edge_rate_table { u32 vddmac; u32 slowdown[8]; diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 7ed0285206d0..b9d60bc8b6b2 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -98,7 +98,7 @@ static const struct vsc85xx_hw_stat vsc8584_hw_stats[] = { }, }; -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) static const struct vsc8531_edge_rate_table edge_table[] = { {MSCC_VDDMAC_3300, { 0, 2, 4, 7, 10, 17, 29, 53} }, {MSCC_VDDMAC_2500, { 0, 3, 6, 10, 14, 23, 37, 63} }, @@ -382,7 +382,7 @@ out_unlock: mutex_unlock(&phydev->lock); } -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED(CONFIG_OF_MDIO) static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev) { u32 vdd, sd; |