Commit d69908fa authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: pcs: xpcs: convert to use read_poll_timeout() 



Convert the xpcs driver to use read_poll_timeout() when waiting for
reset to complete, rather than open-coding this.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce8d6081

drivers/net/pcs/pcs-xpcs.c

+7 −10
Original line number Diff line number Diff line
@@ -220,18 +220,15 @@ static int xpcs_modify_vpcs(struct dw_xpcs *xpcs, int reg, u16 mask, u16 val) 


static int xpcs_poll_reset(struct dw_xpcs *xpcs, int dev)

{

	/* Poll until the reset bit clears (50ms per retry == 0.6 sec) */

	unsigned int retries = 12;

	int ret;

	int ret, val;



	do {

		msleep(50);

		ret = xpcs_read(xpcs, dev, MDIO_CTRL1);

		if (ret < 0)

			return ret;

	} while (ret & MDIO_CTRL1_RESET && --retries);

	ret = read_poll_timeout(xpcs_read, val,

				val < 0 || !(val & MDIO_CTRL1_RESET),

				50000, 600000, true, xpcs, dev, MDIO_CTRL1);

	if (val < 0)

		ret = val;



	return (ret & MDIO_CTRL1_RESET) ? -ETIMEDOUT : 0;

	return ret;

}



static int xpcs_soft_reset(struct dw_xpcs *xpcs,