diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2016-01-06 20:11:06 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-01-07 14:31:24 -0500 |
| commit | ccaa953e9fc7ebb90fba4e4815966683bef4866f (patch) | |
| tree | bb245fd52f0b2e8ee40699feea7a5fd5f59940bc | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-ccaa953e9fc7ebb90fba4e4815966683bef4866f.tar.xz linux-dev-ccaa953e9fc7ebb90fba4e4815966683bef4866f.zip | |
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>
| -rw-r--r-- | include/linux/phy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index a89cb0eef911..77b5e56e2a92 100644 --- 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); /* |