system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

enetc: don't use macro magic for the readx_poll_timeout() callback

Browse source 
The macro enetc_mdio_rd_reg() is just used in that particular case and
has a hardcoded parameter name "mdio_priv". Define a specific function
to use for readx_poll_timeout() instead. Also drop the TIMEOUT macro
since it is used just once.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Walle 2020-12-28 14:00:32 +01:00 committed by David S. Miller
parent 38d26b2443
commit 3c7df82a63
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/ethernet/freescale/enetc/enetc_mdio.c
View file

@ -25,8 +25,6 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,
enetc_port_wr_mdio(mdio_priv->hw, mdio_priv->mdio_base + off, val); enetc_port_wr_mdio(mdio_priv->hw, mdio_priv->mdio_base + off, val);
} }
#define enetc_mdio_rd_reg(off) enetc_mdio_rd(mdio_priv, off)
#define MDIO_CFG_CLKDIV(x) ((((x) >> 1) & 0xff) << 8) #define MDIO_CFG_CLKDIV(x) ((((x) >> 1) & 0xff) << 8)
#define MDIO_CFG_BSY BIT(0) #define MDIO_CFG_BSY BIT(0)
#define MDIO_CFG_RD_ER BIT(1) #define MDIO_CFG_RD_ER BIT(1)
@ -45,13 +43,17 @@ static inline void enetc_mdio_wr(struct enetc_mdio_priv *mdio_priv, int off,
#define MDIO_CTL_READ BIT(15) #define MDIO_CTL_READ BIT(15)
#define MDIO_DATA(x) ((x) & 0xffff) #define MDIO_DATA(x) ((x) & 0xffff)
#define TIMEOUT 1000 static bool enetc_mdio_is_busy(struct enetc_mdio_priv *mdio_priv)
{
return enetc_mdio_rd(mdio_priv, ENETC_MDIO_CFG) & MDIO_CFG_BSY;
}
static int enetc_mdio_wait_complete(struct enetc_mdio_priv *mdio_priv) static int enetc_mdio_wait_complete(struct enetc_mdio_priv *mdio_priv)
{ {
u32 val; bool is_busy;
return readx_poll_timeout(enetc_mdio_rd_reg, ENETC_MDIO_CFG, val, return readx_poll_timeout(enetc_mdio_is_busy, mdio_priv,
!(val & MDIO_CFG_BSY), 10, 10 * TIMEOUT); is_busy, !is_busy, 10, 10 * 1000);
} }
int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value) int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum, u16 value)