diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-20 02:16:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-21 02:48:48 +0100 |
| commit | 348baa6c81cf774811040e4da01438d077a08301 (patch) | |
| tree | c7941285f20f257edc6869ced71011b86d775a7d /drivers/net/ethernet | |
| parent | b44: abort when no PHY is available at all (diff) | |
| download | linux-348baa6c81cf774811040e4da01438d077a08301.tar.xz linux-348baa6c81cf774811040e4da01438d077a08301.zip | |
b44: rename b44_mii_{read, write} to b44_mdio_{read, write}_mii
The next patch will add these functions for phylib, and we should
rename the old ones before. This now indicates that these functions are
used for the mdio registers and on the mii interface.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 09e9e97558b8..40a9de2e223b 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -299,7 +299,7 @@ static inline int b44_writephy(struct b44 *bp, int reg, u32 val) } /* miilib interface */ -static int b44_mii_read(struct net_device *dev, int phy_id, int location) +static int b44_mdio_read_mii(struct net_device *dev, int phy_id, int location) { u32 val; struct b44 *bp = netdev_priv(dev); @@ -309,8 +309,8 @@ static int b44_mii_read(struct net_device *dev, int phy_id, int location) return val; } -static void b44_mii_write(struct net_device *dev, int phy_id, int location, - int val) +static void b44_mdio_write_mii(struct net_device *dev, int phy_id, int location, + int val) { struct b44 *bp = netdev_priv(dev); __b44_writephy(bp, phy_id, location, val); @@ -2213,8 +2213,8 @@ static int b44_init_one(struct ssb_device *sdev, } bp->mii_if.dev = dev; - bp->mii_if.mdio_read = b44_mii_read; - bp->mii_if.mdio_write = b44_mii_write; + bp->mii_if.mdio_read = b44_mdio_read_mii; + bp->mii_if.mdio_write = b44_mdio_write_mii; bp->mii_if.phy_id = bp->phy_addr; bp->mii_if.phy_id_mask = 0x1f; bp->mii_if.reg_num_mask = 0x1f; |