Skip to content

Commit

Permalink
net: mvmdio: rename base register cookie from smireg to regs
Browse files Browse the repository at this point in the history
This patch renames the base register cookie in the mvmdio drive from
"smireg" to "regs" since a subsequent patch is going to use an ioremap()
cookie whose size is larger than a single register of 4 bytes. No
functionnal code change introduced.

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Mar 22, 2013
1 parent 7111b71 commit 3712b71
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/ethernet/marvell/mvmdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

struct orion_mdio_dev {
struct mutex lock;
void __iomem *smireg;
void __iomem *regs;
};

/* Wait for the SMI unit to be ready for another operation
Expand All @@ -52,7 +52,7 @@ static int orion_mdio_wait_ready(struct mii_bus *bus)

count = 0;
while (1) {
val = readl(dev->smireg);
val = readl(dev->regs);
if (!(val & MVMDIO_SMI_BUSY))
break;

Expand Down Expand Up @@ -87,12 +87,12 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id,
writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) |
(regnum << MVMDIO_SMI_PHY_REG_SHIFT) |
MVMDIO_SMI_READ_OPERATION),
dev->smireg);
dev->regs);

/* Wait for the value to become available */
count = 0;
while (1) {
val = readl(dev->smireg);
val = readl(dev->regs);
if (val & MVMDIO_SMI_READ_VALID)
break;

Expand Down Expand Up @@ -129,7 +129,7 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id,
(regnum << MVMDIO_SMI_PHY_REG_SHIFT) |
MVMDIO_SMI_WRITE_OPERATION |
(value << MVMDIO_SMI_DATA_SHIFT)),
dev->smireg);
dev->regs);

mutex_unlock(&dev->lock);

Expand Down Expand Up @@ -178,8 +178,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
bus->irq[i] = PHY_POLL;

dev = bus->priv;
dev->smireg = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!dev->smireg) {
dev->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!dev->regs) {
dev_err(&pdev->dev, "Unable to remap SMI register\n");
kfree(bus->irq);
mdiobus_free(bus);
Expand Down

0 comments on commit 3712b71

Please sign in to comment.