openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: qcom/emac: do not call emac_mac_start twice 

emac_mac_start() uses information from the external PHY to program
the MAC, so it makes no sense to call it before the link is up.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Timur Tabi 2017-01-27 16:43:45 -06:00 committed by David S. Miller
parent 3db5d555ea
commit 0f20276dd5
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/qualcomm/emac/emac-mac.c
View File

@ -556,7 +556,7 @@ void emac_mac_reset(struct emac_adapter *adpt)
emac_reg_update32(adpt->base + EMAC_DMA_MAS_CTRL, 0, INT_RD_CLR_EN); emac_reg_update32(adpt->base + EMAC_DMA_MAS_CTRL, 0, INT_RD_CLR_EN);
} }
void emac_mac_start(struct emac_adapter *adpt) static void emac_mac_start(struct emac_adapter *adpt)
{ {
struct phy_device *phydev = adpt->phydev; struct phy_device *phydev = adpt->phydev;
u32 mac, csr1; u32 mac, csr1;

1
drivers/net/ethernet/qualcomm/emac/emac-mac.h
View File

@ -230,7 +230,6 @@ struct emac_adapter;
int emac_mac_up(struct emac_adapter *adpt); int emac_mac_up(struct emac_adapter *adpt);
void emac_mac_down(struct emac_adapter *adpt); void emac_mac_down(struct emac_adapter *adpt);
void emac_mac_reset(struct emac_adapter *adpt); void emac_mac_reset(struct emac_adapter *adpt);
void emac_mac_start(struct emac_adapter *adpt);
void emac_mac_stop(struct emac_adapter *adpt); void emac_mac_stop(struct emac_adapter *adpt);
void emac_mac_mode_config(struct emac_adapter *adpt); void emac_mac_mode_config(struct emac_adapter *adpt);
void emac_mac_rx_process(struct emac_adapter *adpt, struct emac_rx_queue *rx_q, void emac_mac_rx_process(struct emac_adapter *adpt, struct emac_rx_queue *rx_q,

2
drivers/net/ethernet/qualcomm/emac/emac.c
View File

@ -280,8 +280,6 @@ static int emac_open(struct net_device *netdev)
return ret; return ret;
} }
emac_mac_start(adpt);
return 0; return 0;
} }