From 0caf0305a39e62d5cb33cfd1e98aa77a25768232 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 15 Jun 2017 16:43:19 +0200 Subject: [PATCH] net: mvmdio: remove duplicate locking The MDIO layer already provides per-bus locking, so there's no need for MDIO bus drivers to do their own internal locking. Remove this. Signed-off-by: Russell King Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller --- drivers/net/ethernet/marvell/mvmdio.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 583f1c5753c2..eab625752b12 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ #define MVMDIO_SMI_POLL_INTERVAL_MAX 55 struct orion_mdio_dev { - struct mutex lock; void __iomem *regs; struct clk *clk[3]; /* @@ -116,8 +114,6 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, u32 val; int ret; - mutex_lock(&dev->lock); - ret = orion_mdio_wait_ready(bus); if (ret < 0) goto out; @@ -140,7 +136,6 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, ret = val & GENMASK(15, 0); out: - mutex_unlock(&dev->lock); return ret; } @@ -150,8 +145,6 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id, struct orion_mdio_dev *dev = bus->priv; int ret; - mutex_lock(&dev->lock); - ret = orion_mdio_wait_ready(bus); if (ret < 0) goto out; @@ -163,7 +156,6 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id, dev->regs); out: - mutex_unlock(&dev->lock); return ret; } @@ -244,8 +236,6 @@ static int orion_mdio_probe(struct platform_device *pdev) return -EPROBE_DEFER; } - mutex_init(&dev->lock); - if (pdev->dev.of_node) ret = of_mdiobus_register(bus, pdev->dev.of_node); else -- 2.20.1