diff options
-rw-r--r-- | drivers/net/ethernet/marvell/mvmdio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index bbc5fdedd13b..3e2711d22451 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | struct orion_mdio_dev { | 40 | struct orion_mdio_dev { |
41 | struct mutex lock; | 41 | struct mutex lock; |
42 | void __iomem *smireg; | 42 | void __iomem *regs; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | /* Wait for the SMI unit to be ready for another operation | 45 | /* Wait for the SMI unit to be ready for another operation |
@@ -52,7 +52,7 @@ static int orion_mdio_wait_ready(struct mii_bus *bus) | |||
52 | 52 | ||
53 | count = 0; | 53 | count = 0; |
54 | while (1) { | 54 | while (1) { |
55 | val = readl(dev->smireg); | 55 | val = readl(dev->regs); |
56 | if (!(val & MVMDIO_SMI_BUSY)) | 56 | if (!(val & MVMDIO_SMI_BUSY)) |
57 | break; | 57 | break; |
58 | 58 | ||
@@ -87,12 +87,12 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, | |||
87 | writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | | 87 | writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | |
88 | (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | | 88 | (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | |
89 | MVMDIO_SMI_READ_OPERATION), | 89 | MVMDIO_SMI_READ_OPERATION), |
90 | dev->smireg); | 90 | dev->regs); |
91 | 91 | ||
92 | /* Wait for the value to become available */ | 92 | /* Wait for the value to become available */ |
93 | count = 0; | 93 | count = 0; |
94 | while (1) { | 94 | while (1) { |
95 | val = readl(dev->smireg); | 95 | val = readl(dev->regs); |
96 | if (val & MVMDIO_SMI_READ_VALID) | 96 | if (val & MVMDIO_SMI_READ_VALID) |
97 | break; | 97 | break; |
98 | 98 | ||
@@ -129,7 +129,7 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id, | |||
129 | (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | | 129 | (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | |
130 | MVMDIO_SMI_WRITE_OPERATION | | 130 | MVMDIO_SMI_WRITE_OPERATION | |
131 | (value << MVMDIO_SMI_DATA_SHIFT)), | 131 | (value << MVMDIO_SMI_DATA_SHIFT)), |
132 | dev->smireg); | 132 | dev->regs); |
133 | 133 | ||
134 | mutex_unlock(&dev->lock); | 134 | mutex_unlock(&dev->lock); |
135 | 135 | ||
@@ -178,8 +178,8 @@ static int orion_mdio_probe(struct platform_device *pdev) | |||
178 | bus->irq[i] = PHY_POLL; | 178 | bus->irq[i] = PHY_POLL; |
179 | 179 | ||
180 | dev = bus->priv; | 180 | dev = bus->priv; |
181 | dev->smireg = devm_ioremap(&pdev->dev, r->start, resource_size(r)); | 181 | dev->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r)); |
182 | if (!dev->smireg) { | 182 | if (!dev->regs) { |
183 | dev_err(&pdev->dev, "Unable to remap SMI register\n"); | 183 | dev_err(&pdev->dev, "Unable to remap SMI register\n"); |
184 | kfree(bus->irq); | 184 | kfree(bus->irq); |
185 | mdiobus_free(bus); | 185 | mdiobus_free(bus); |