Commit b7c818d1 authored by Ansuel Smith's avatar Ansuel Smith Committed by David S. Miller
Browse files

net: dsa: qca8k: handle error from qca8k_busy_wait 



Propagate errors from qca8k_busy_wait instead of hardcoding return
value.

Signed-off-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aaf42142

drivers/net/dsa/qca8k.c

+13 −8
Original line number Diff line number Diff line
@@ -388,8 +388,9 @@ qca8k_fdb_access(struct qca8k_priv *priv, enum qca8k_fdb_cmd cmd, int port) 
		return ret;



	/* wait for completion */

	if (qca8k_busy_wait(priv, QCA8K_REG_ATU_FUNC, QCA8K_ATU_FUNC_BUSY))

		return -1;

	ret = qca8k_busy_wait(priv, QCA8K_REG_ATU_FUNC, QCA8K_ATU_FUNC_BUSY);

	if (ret)

		return ret;



	/* Check for table full violation when adding an entry */

	if (cmd == QCA8K_FDB_LOAD) {
@@ -468,8 +469,9 @@ qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid) 
		return ret;



	/* wait for completion */

	if (qca8k_busy_wait(priv, QCA8K_REG_VTU_FUNC1, QCA8K_VTU_FUNC1_BUSY))

		return -ETIMEDOUT;

	ret = qca8k_busy_wait(priv, QCA8K_REG_VTU_FUNC1, QCA8K_VTU_FUNC1_BUSY);

	if (ret)

		return ret;



	/* Check for table full violation when adding an entry */

	if (cmd == QCA8K_VLAN_LOAD) {
@@ -580,7 +582,9 @@ qca8k_mib_init(struct qca8k_priv *priv) 
	if (ret)

		goto exit;



	qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY);

	ret = qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY);

	if (ret)

		goto exit;



	ret = qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_CPU_KEEP);

	if (ret)
@@ -670,9 +674,10 @@ qca8k_mdio_read(struct qca8k_priv *priv, int port, u32 regnum) 
	if (ret)

		return ret;



	if (qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,

			    QCA8K_MDIO_MASTER_BUSY))

		return -ETIMEDOUT;

	ret = qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,

			      QCA8K_MDIO_MASTER_BUSY);

	if (ret)

		return ret;



	val = qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL);

	if (val < 0)