linux-kernel - [PATCH net-next 5/7] net: phy: aquantia: use phy_read_mmd_poll

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200319163910.14733-6-zhengdejin5@gmail.com>
Date:   Fri, 20 Mar 2020 00:39:08 +0800
From:   Dejin Zheng <zhengdejin5@...il.com>
To:     andrew@...n.ch, f.fainelli@...il.com, hkallweit1@...il.com,
        linux@...linux.org.uk, davem@...emloft.net, tglx@...utronix.de,
        broonie@...nel.org, corbet@....net, mchehab+samsung@...nel.org,
        netdev@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org, Dejin Zheng <zhengdejin5@...il.com>
Subject: [PATCH net-next 5/7] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code

use phy_read_mmd_poll_timeout() to replace the poll codes for
simplify the code in aqr107_wait_reset_complete() function.

Signed-off-by: Dejin Zheng <zhengdejin5@...il.com>
---
 drivers/net/phy/aquantia_main.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index 31927b2c7d5a..fdd037383217 100644
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -451,16 +451,14 @@ static int aqr107_set_tunable(struct phy_device *phydev,
  */
 static int aqr107_wait_reset_complete(struct phy_device *phydev)
 {
-	int val, retries = 100;
-
-	do {
-		val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID);
-		if (val < 0)
-			return val;
-		msleep(20);
-	} while (!val && --retries);
+	int val, ret;
 
-	return val ? 0 : -ETIMEDOUT;
+	ret = phy_read_mmd_poll_timeout(val, val < 0 || val != 0, 20000,
+					2000000, phydev, MDIO_MMD_VEND1,
+					VEND1_GLOBAL_FW_ID);
+	if (val < 0)
+		ret = val;
+	return ret;
 }
 
 static void aqr107_chip_info(struct phy_device *phydev)
-- 
2.25.0