浏览代码

net: mvmdio: slight optimisation of orion_mdio_write

Make only a single call to mutex_unlock in orion_mdio_write.

Signed-off-by: Leigh Brown <leigh@solinno.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Leigh Brown 12 年之前
父节点
当前提交
526edcf567
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      drivers/net/ethernet/marvell/mvmdio.c

+ 4 - 6
drivers/net/ethernet/marvell/mvmdio.c

@@ -150,10 +150,8 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id,
 	mutex_lock(&dev->lock);
 	mutex_lock(&dev->lock);
 
 
 	ret = orion_mdio_wait_ready(bus);
 	ret = orion_mdio_wait_ready(bus);
-	if (ret < 0) {
-		mutex_unlock(&dev->lock);
-		return ret;
-	}
+	if (ret < 0)
+		goto out;
 
 
 	writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) |
 	writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) |
 		(regnum << MVMDIO_SMI_PHY_REG_SHIFT)  |
 		(regnum << MVMDIO_SMI_PHY_REG_SHIFT)  |
@@ -161,9 +159,9 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id,
 		(value << MVMDIO_SMI_DATA_SHIFT)),
 		(value << MVMDIO_SMI_DATA_SHIFT)),
 	       dev->regs);
 	       dev->regs);
 
 
+out:
 	mutex_unlock(&dev->lock);
 	mutex_unlock(&dev->lock);
-
-	return 0;
+	return ret;
 }
 }
 
 
 static int orion_mdio_reset(struct mii_bus *bus)
 static int orion_mdio_reset(struct mii_bus *bus)