phy: Consistently use addr for address on an MII bus

Within phy.h, an address on an MII bus has been called both addr and
phy_id. phy_id is particularly confusion, since it also means the ID
found in register 3, if the device on the bus is a phy. Consistently
use addr.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/phy.h b/include/linux/phy.h
index a89cb0eef911eaea6ebf037ed276f9138426bac3..77b5e56e2a925afed08a8ff9ddfd1abd79ba8054 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -158,8 +158,8 @@ struct mii_bus {
        const char *name;
        char id[MII_BUS_ID_SIZE];
        void *priv;
-       int (*read)(struct mii_bus *bus, int phy_id, int regnum);
-       int (*write)(struct mii_bus *bus, int phy_id, int regnum, u16 val);
+       int (*read)(struct mii_bus *bus, int addr, int regnum);
+       int (*write)(struct mii_bus *bus, int addr, int regnum, u16 val);
        int (*reset)(struct mii_bus *bus);
 
        /*