Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mvmdio: rename base register cookie from smireg to regs

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>

authored by

Florian Fainelli and committed by
David S. Miller
3712b717 7111b717

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