aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorVince Bridgers <vbridger@opensource.altera.com>2015-02-12 11:47:45 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-19 15:23:42 -0500
commitea8860eb504a953cf8fe0e96c3166201b05c9b73 (patch)
treed83aad91d4dc7f9e5bcea9006608a04d47aed75c /drivers/net/ethernet
parenta923fc730fdbbf079eadfe2b9a1644971bd95793 (diff)
net: eth: altera: Change reset_mac failure message masks from err to dbg
This debug output is not really an error message since mac reset can fail if the phy clocks are gated, specifically when the phy has been placed in a powered down or isolation mode. The netdev output masks were changed from err to dbg, and comments added in the code. Signed-off-by: Vince Bridgers <vbridger@opensource.altera.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/altera/altera_tse_main.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 4773d98927cf..a1ee261bff5c 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -1099,8 +1099,12 @@ static int tse_open(struct net_device *dev)
1099 1099
1100 spin_lock(&priv->mac_cfg_lock); 1100 spin_lock(&priv->mac_cfg_lock);
1101 ret = reset_mac(priv); 1101 ret = reset_mac(priv);
1102 /* Note that reset_mac will fail if the clocks are gated by the PHY
1103 * due to the PHY being put into isolation or power down mode.
1104 * This is not an error if reset fails due to no clock.
1105 */
1102 if (ret) 1106 if (ret)
1103 netdev_err(dev, "Cannot reset MAC core (error: %d)\n", ret); 1107 netdev_dbg(dev, "Cannot reset MAC core (error: %d)\n", ret);
1104 1108
1105 ret = init_mac(priv); 1109 ret = init_mac(priv);
1106 spin_unlock(&priv->mac_cfg_lock); 1110 spin_unlock(&priv->mac_cfg_lock);
@@ -1204,8 +1208,12 @@ static int tse_shutdown(struct net_device *dev)
1204 spin_lock(&priv->tx_lock); 1208 spin_lock(&priv->tx_lock);
1205 1209
1206 ret = reset_mac(priv); 1210 ret = reset_mac(priv);
1211 /* Note that reset_mac will fail if the clocks are gated by the PHY
1212 * due to the PHY being put into isolation or power down mode.
1213 * This is not an error if reset fails due to no clock.
1214 */
1207 if (ret) 1215 if (ret)
1208 netdev_err(dev, "Cannot reset MAC core (error: %d)\n", ret); 1216 netdev_dbg(dev, "Cannot reset MAC core (error: %d)\n", ret);
1209 priv->dmaops->reset_dma(priv); 1217 priv->dmaops->reset_dma(priv);
1210 free_skbufs(dev); 1218 free_skbufs(dev);
1211 1219