Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f20276d authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller
Browse files

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: default avatarTimur Tabi <timur@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3db5d555

drivers/net/ethernet/qualcomm/emac/emac-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



void emac_mac_start(struct emac_adapter *adpt)

static void emac_mac_start(struct emac_adapter *adpt)

{

	struct phy_device *phydev = adpt->phydev;

	u32 mac, csr1;

drivers/net/ethernet/qualcomm/emac/emac-mac.h

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ struct emac_adapter; 
int  emac_mac_up(struct emac_adapter *adpt);

void emac_mac_down(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_mode_config(struct emac_adapter *adpt);

void emac_mac_rx_process(struct emac_adapter *adpt, struct emac_rx_queue *rx_q,

drivers/net/ethernet/qualcomm/emac/emac.c

+0 −2
Original line number Diff line number Diff line
@@ -280,8 +280,6 @@ static int emac_open(struct net_device *netdev) 
		return ret;

	}



	emac_mac_start(adpt);



	return 0;

}