1 From 6dcaccfc1e0046632dd54d91b6f679fee7f841bc Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Sun, 6 Oct 2013 15:31:04 +0200
4 Subject: [PATCH 4/5] b44: rename b44_mii_{read,write} to
5 b44_mdio_{read,write}_mii
7 The next patch will add these functions for phylib, and we should
8 rename the old ones before. This now indicates that these functions are
9 used for the mdio registers and on the mii interface.
11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
13 drivers/net/ethernet/broadcom/b44.c | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
16 --- a/drivers/net/ethernet/broadcom/b44.c
17 +++ b/drivers/net/ethernet/broadcom/b44.c
18 @@ -299,7 +299,7 @@ static inline int b44_writephy(struct b4
21 /* miilib interface */
22 -static int b44_mii_read(struct net_device *dev, int phy_id, int location)
23 +static int b44_mdio_read_mii(struct net_device *dev, int phy_id, int location)
26 struct b44 *bp = netdev_priv(dev);
27 @@ -309,8 +309,8 @@ static int b44_mii_read(struct net_devic
31 -static void b44_mii_write(struct net_device *dev, int phy_id, int location,
33 +static void b44_mdio_write_mii(struct net_device *dev, int phy_id, int location,
36 struct b44 *bp = netdev_priv(dev);
37 __b44_writephy(bp, phy_id, location, val);
38 @@ -2214,8 +2214,8 @@ static int b44_init_one(struct ssb_devic
42 - bp->mii_if.mdio_read = b44_mii_read;
43 - bp->mii_if.mdio_write = b44_mii_write;
44 + bp->mii_if.mdio_read = b44_mdio_read_mii;
45 + bp->mii_if.mdio_write = b44_mdio_write_mii;
46 bp->mii_if.phy_id = bp->phy_addr;
47 bp->mii_if.phy_id_mask = 0x1f;
48 bp->mii_if.reg_num_mask = 0x1f;