From 68888ce075a5e77f0df659b128a7cb7c597a73cb Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 23 Jun 2016 14:50:15 +0100 Subject: phy: separate swphy state validation from register generation Separate out the generation of MII registers from the state validation. This allows us to simplify the error handing in fixed_phy() by allowing earlier error detection. Reviewed-by: Florian Fainelli Signed-off-by: Russell King Signed-off-by: David S. Miller --- drivers/net/phy/swphy.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'drivers/net/phy/swphy.c') diff --git a/drivers/net/phy/swphy.c b/drivers/net/phy/swphy.c index c88a194b4cb6..21a9bd8a7830 100644 --- a/drivers/net/phy/swphy.c +++ b/drivers/net/phy/swphy.c @@ -86,6 +86,29 @@ static int swphy_decode_speed(int speed) } } +/** + * swphy_validate_state - validate the software phy status + * @state: software phy status + * + * This checks that we can represent the state stored in @state can be + * represented in the emulated MII registers. Returns 0 if it can, + * otherwise returns -EINVAL. + */ +int swphy_validate_state(const struct fixed_phy_status *state) +{ + int err; + + if (state->link) { + err = swphy_decode_speed(state->speed); + if (err < 0) { + pr_warn("swphy: unknown speed\n"); + return -EINVAL; + } + } + return 0; +} +EXPORT_SYMBOL_GPL(swphy_validate_state); + /** * swphy_update_regs - update MII register array with fixed phy state * @regs: array of 32 registers to update @@ -94,7 +117,7 @@ static int swphy_decode_speed(int speed) * Update the array of MII registers with the fixed phy link, speed, * duplex and pause mode settings. */ -int swphy_update_regs(u16 *regs, const struct fixed_phy_status *state) +void swphy_update_regs(u16 *regs, const struct fixed_phy_status *state) { int speed_index, duplex_index; u16 bmsr = BMSR_ANEGCAPABLE; @@ -103,10 +126,8 @@ int swphy_update_regs(u16 *regs, const struct fixed_phy_status *state) u16 lpa = 0; speed_index = swphy_decode_speed(state->speed); - if (speed_index < 0) { - pr_warn("swphy: unknown speed\n"); - return -EINVAL; - } + if (WARN_ON(speed_index < 0)) + return; duplex_index = state->duplex ? SWMII_DUPLEX_FULL : SWMII_DUPLEX_HALF; @@ -133,7 +154,5 @@ int swphy_update_regs(u16 *regs, const struct fixed_phy_status *state) regs[MII_BMCR] = bmcr; regs[MII_LPA] = lpa; regs[MII_STAT1000] = lpagb; - - return 0; } EXPORT_SYMBOL_GPL(swphy_update_regs); -- cgit v1.2.3