@@ -71,31 +71,25 @@ static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
static int wait_phy_eeprom_ready(struct usbnet *dev, int phy)
{
- int i, ret;
+ int i;
- ret = 0;
for (i = 0; i < SR_SHARE_TIMEOUT; i++) {
u8 tmp = 0;
+ int ret;
udelay(1);
ret = sr_read_reg(dev, EPCR, &tmp);
if (ret < 0)
- goto out;
+ return ret;
/* ready */
- if ((tmp & EPCR_ERRE) == 0)
- break;
+ if (!(tmp & EPCR_ERRE))
+ return 0;
}
- if (i >= SR_SHARE_TIMEOUT) {
- netdev_err(dev->net, "%s write timed out!\n",
- phy ? "phy" : "eeprom");
- ret = -EIO;
- goto out;
- }
+ netdev_err(dev->net, "%s write timed out!\n", phy ? "phy" : "eeprom");
-out:
- return ret;
+ return -EIO;
}
static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
@@ -110,7 +104,7 @@ static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
ret = wait_phy_eeprom_ready(dev, phy);
if (ret < 0)
- goto out;
+ goto out_unlock;
sr_write_reg(dev, EPCR, 0x0);
ret = sr_read(dev, EPDR, 2, value);
@@ -118,7 +112,7 @@ static int sr_share_read_word(struct usbnet *dev, int phy, u8 reg,
netdev_dbg(dev->net, "read shared %d 0x%02x returned 0x%04x, %d\n",
phy, reg, *value, ret);
-out:
+out_unlock:
mutex_unlock(&dev->phy_mutex);
return ret;
}
@@ -132,18 +126,18 @@ static int sr_share_write_word(struct usbnet *dev, int phy, u8 reg,
ret = sr_write(dev, EPDR, 2, &value);
if (ret < 0)
- goto out;
+ goto out_unlock;
sr_write_reg(dev, EPAR, phy ? (reg | 0x40) : reg);
sr_write_reg(dev, EPCR, phy ? 0x1a : 0x12);
ret = wait_phy_eeprom_ready(dev, phy);
if (ret < 0)
- goto out;
+ goto out_unlock;
sr_write_reg(dev, EPCR, 0x0);
-out:
+out_unlock:
mutex_unlock(&dev->phy_mutex);
return ret;
}