diff options
| author | Rafał Miłecki | 2013-12-20 15:33:52 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-12-27 19:28:02 +0100 |
| commit | 5322dbf00ad7862272d460d4711401cd4ef5b760 (patch) | |
| tree | 181ba5206d8b9c20d2092b8419d1e9ff00ec6ae9 /drivers/net/ethernet/broadcom/bgmac.c | |
| parent | ieee802154: space prohibited before that close parenthesis (diff) | |
| download | kernel-qcow2-linux-5322dbf00ad7862272d460d4711401cd4ef5b760.tar.gz kernel-qcow2-linux-5322dbf00ad7862272d460d4711401cd4ef5b760.tar.xz kernel-qcow2-linux-5322dbf00ad7862272d460d4711401cd4ef5b760.zip | |
bgmac: drop duplicated PHY defines
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bgmac.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index b665a6aa7e14..3cd5d68a3d02 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -725,11 +725,9 @@ static void bgmac_phy_reset(struct bgmac *bgmac) if (bgmac->phyaddr == BGMAC_PHY_NOREGS) return; - bgmac_phy_write(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL, - BGMAC_PHY_CTL_RESET); + bgmac_phy_write(bgmac, bgmac->phyaddr, MII_BMCR, BMCR_RESET); udelay(100); - if (bgmac_phy_read(bgmac, bgmac->phyaddr, BGMAC_PHY_CTL) & - BGMAC_PHY_CTL_RESET) + if (bgmac_phy_read(bgmac, bgmac->phyaddr, MII_BMCR) & BMCR_RESET) bgmac_err(bgmac, "PHY reset failed\n"); bgmac_phy_init(bgmac); } |