d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: rockchip: typec_phy: Rename timeout to retry

Browse Source 
Declare retry in the function scope.
Rename it to retry as there is a timeout function which was
causing to code to compile.

Reported by:	jhibbits
MFC after:	1 month
X-MFC-WITH:	r354089
This commit is contained in:
Emmanuel Vadot 2019-10-29 18:36:16 +00:00
parent dd4c0b5a6c
commit 62de73eaf1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm64/rockchip/rk_typec_phy.c
View File

@ -191,7 +191,7 @@ rk_typec_phy_enable(struct phynode *phynode, bool enable)
device_t dev;
intptr_t phy;
uint32_t reg;
int err;
int err, retry;
dev = phynode_get_device(phynode);
phy = phynode_get_id(phynode);
@ -271,13 +271,13 @@ rk_typec_phy_enable(struct phynode *phynode, bool enable)
hwreset_deassert(sc->rst_uphy);
for (int timeout = 10000; timeout > 0; timeout--) {
for (retry = 10000; retry > 0; retry--) {
reg = RK_TYPEC_PHY_READ(sc, PMA_CMN_CTRL1);
if (reg & PMA_CMN_CTRL1_READY)
break;
DELAY(10);
}
if (timeout == 0) {
if (retry == 0) {
device_printf(sc->dev, "Timeout waiting for PMA\n");
return (ENXIO);
}