diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2017-06-15 16:43:19 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-16 12:27:11 -0400 |
| commit | 0caf0305a39e62d5cb33cfd1e98aa77a25768232 (patch) | |
| tree | 80d698af6eeed856a33f2c2fd82e1803bd1d1485 /drivers/net/ethernet/marvell/mvmdio.c | |
| parent | net: mvmdio: use GENMASK for masks (diff) | |
| download | linux-dev-0caf0305a39e62d5cb33cfd1e98aa77a25768232.tar.xz linux-dev-0caf0305a39e62d5cb33cfd1e98aa77a25768232.zip | |
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 <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvmdio.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvmdio.c | 10 |
1 files changed, 0 insertions, 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 <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/mutex.h> #include <linux/of_mdio.h> #include <linux/phy.h> #include <linux/platform_device.h> @@ -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 |