Skip to content

Commit

Permalink
b44: rename b44_mii_{read, write} to b44_mdio_{read, write}_mii
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hauke Mehrtens authored and David S. Miller committed Dec 21, 2013
1 parent 7befa6a commit 348baa6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ethernet/broadcom/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 348baa6

Please sign in to comment.