2013-10-23 05:01:35 +08:00
|
|
|
From 16b8dde613e5b59bee13537469f3562081da1a2c Mon Sep 17 00:00:00 2001
|
2013-10-07 02:31:32 +08:00
|
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
|
|
|
Date: Sun, 6 Oct 2013 15:31:04 +0200
|
2013-10-23 05:01:35 +08:00
|
|
|
Subject: [PATCH 5/9] b44: rename b44_mii_{read,write} to
|
2013-10-07 02:31:32 +08:00
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/ethernet/broadcom/b44.c | 10 +++++-----
|
|
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
|
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
|
|
|
@@ -299,7 +299,7 @@ static inline int b44_writephy(struct b4
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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_devic
|
|
|
|
|
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);
|
|
|
|
|
@@ -2214,8 +2214,8 @@ static int b44_init_one(struct ssb_devic
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
