diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
| commit | d1653548d29959a6ea6b4037a00b48a28257e6e6 (patch) | |
| tree | c5e53b262c5cfe2be50066b5b9c886c23a4ec3d6 /drivers/net/mvneta.c | |
| parent | f3384c6ddaab99a77895443b10d2034f17ca0014 (diff) | |
| parent | d99e6f78dedd473771d6dee1007a05b8574d5b5c (diff) | |
Merge branch '2023-03-02-kconfig-and-CONFIG-cleanups' into next
- Partial merge of a series of mine to select some framework options
that shouldn't be prompted for (and remove some unused code related to
that), and a partial merge of a series from Simon to remove some dead
code and address various CONFIG_IS_ENABLED/IS_ENABLED issues in code.
Diffstat (limited to 'drivers/net/mvneta.c')
| -rw-r--r-- | drivers/net/mvneta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d45..24933473fa0 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) mvreg_write(pp, MVNETA_SDMA_CONFIG, val); /* Enable PHY polling in hardware if not in fixed-link mode */ - if (!CONFIG_IS_ENABLED(PHY_FIXED) || + if (!IS_ENABLED(CONFIG_PHY_FIXED) || pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr); @@ -1176,7 +1176,7 @@ static void mvneta_adjust_link(struct udevice *dev) * be added). Also, why is ADVERT_FC enabled if we don't enable * inband AN at all? */ - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | |