Merge branch 'sh_eth'
Sergei Shtylyov says: ==================== Beautify 'sh_eth' driver's messages This patchset converts te driver to using netdev_*() and netif_*() to print out its messages whenever possible. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
Коммит
d5c065e371
|
|
@ -400,7 +400,8 @@ static void sh_eth_select_mii(struct net_device *ndev)
|
|||
value = 0x0;
|
||||
break;
|
||||
default:
|
||||
pr_warn("PHY interface mode was not setup. Set to MII.\n");
|
||||
netdev_warn(ndev,
|
||||
"PHY interface mode was not setup. Set to MII.\n");
|
||||
value = 0x1;
|
||||
break;
|
||||
}
|
||||
|
|
@ -854,7 +855,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
|
|||
cnt--;
|
||||
}
|
||||
if (cnt <= 0) {
|
||||
pr_err("Device reset failed\n");
|
||||
netdev_err(ndev, "Device reset failed\n");
|
||||
ret = -ETIMEDOUT;
|
||||
}
|
||||
return ret;
|
||||
|
|
@ -1556,8 +1557,7 @@ ignore_link:
|
|||
/* Unused write back interrupt */
|
||||
if (intr_status & EESR_TABT) { /* Transmit Abort int */
|
||||
ndev->stats.tx_aborted_errors++;
|
||||
if (netif_msg_tx_err(mdp))
|
||||
dev_err(&ndev->dev, "Transmit Abort\n");
|
||||
netif_err(mdp, tx_err, ndev, "Transmit Abort\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1566,45 +1566,38 @@ ignore_link:
|
|||
if (intr_status & EESR_RFRMER) {
|
||||
/* Receive Frame Overflow int */
|
||||
ndev->stats.rx_frame_errors++;
|
||||
if (netif_msg_rx_err(mdp))
|
||||
dev_err(&ndev->dev, "Receive Abort\n");
|
||||
netif_err(mdp, rx_err, ndev, "Receive Abort\n");
|
||||
}
|
||||
}
|
||||
|
||||
if (intr_status & EESR_TDE) {
|
||||
/* Transmit Descriptor Empty int */
|
||||
ndev->stats.tx_fifo_errors++;
|
||||
if (netif_msg_tx_err(mdp))
|
||||
dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
|
||||
netif_err(mdp, tx_err, ndev, "Transmit Descriptor Empty\n");
|
||||
}
|
||||
|
||||
if (intr_status & EESR_TFE) {
|
||||
/* FIFO under flow */
|
||||
ndev->stats.tx_fifo_errors++;
|
||||
if (netif_msg_tx_err(mdp))
|
||||
dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
|
||||
netif_err(mdp, tx_err, ndev, "Transmit FIFO Under flow\n");
|
||||
}
|
||||
|
||||
if (intr_status & EESR_RDE) {
|
||||
/* Receive Descriptor Empty int */
|
||||
ndev->stats.rx_over_errors++;
|
||||
|
||||
if (netif_msg_rx_err(mdp))
|
||||
dev_err(&ndev->dev, "Receive Descriptor Empty\n");
|
||||
netif_err(mdp, rx_err, ndev, "Receive Descriptor Empty\n");
|
||||
}
|
||||
|
||||
if (intr_status & EESR_RFE) {
|
||||
/* Receive FIFO Overflow int */
|
||||
ndev->stats.rx_fifo_errors++;
|
||||
if (netif_msg_rx_err(mdp))
|
||||
dev_err(&ndev->dev, "Receive FIFO Overflow\n");
|
||||
netif_err(mdp, rx_err, ndev, "Receive FIFO Overflow\n");
|
||||
}
|
||||
|
||||
if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
|
||||
/* Address Error */
|
||||
ndev->stats.tx_fifo_errors++;
|
||||
if (netif_msg_tx_err(mdp))
|
||||
dev_err(&ndev->dev, "Address Error\n");
|
||||
netif_err(mdp, tx_err, ndev, "Address Error\n");
|
||||
}
|
||||
|
||||
mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
|
||||
|
|
@ -1615,9 +1608,9 @@ ignore_link:
|
|||
u32 edtrr = sh_eth_read(ndev, EDTRR);
|
||||
|
||||
/* dmesg */
|
||||
dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
|
||||
intr_status, mdp->cur_tx, mdp->dirty_tx,
|
||||
(u32)ndev->state, edtrr);
|
||||
netdev_err(ndev, "TX error. status=%8.8x cur_tx=%8.8x dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
|
||||
intr_status, mdp->cur_tx, mdp->dirty_tx,
|
||||
(u32)ndev->state, edtrr);
|
||||
/* dirty buffer free */
|
||||
sh_eth_txfree(ndev);
|
||||
|
||||
|
|
@ -1662,9 +1655,9 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
|
|||
EESIPR);
|
||||
__napi_schedule(&mdp->napi);
|
||||
} else {
|
||||
dev_warn(&ndev->dev,
|
||||
"ignoring interrupt, status 0x%08lx, mask 0x%08lx.\n",
|
||||
intr_status, intr_enable);
|
||||
netdev_warn(ndev,
|
||||
"ignoring interrupt, status 0x%08lx, mask 0x%08lx.\n",
|
||||
intr_status, intr_enable);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1793,12 +1786,12 @@ static int sh_eth_phy_init(struct net_device *ndev)
|
|||
}
|
||||
|
||||
if (IS_ERR(phydev)) {
|
||||
dev_err(&ndev->dev, "failed to connect PHY\n");
|
||||
netdev_err(ndev, "failed to connect PHY\n");
|
||||
return PTR_ERR(phydev);
|
||||
}
|
||||
|
||||
dev_info(&ndev->dev, "attached PHY %d (IRQ %d) to driver %s\n",
|
||||
phydev->addr, phydev->irq, phydev->drv->name);
|
||||
netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",
|
||||
phydev->addr, phydev->irq, phydev->drv->name);
|
||||
|
||||
mdp->phydev = phydev;
|
||||
|
||||
|
|
@ -1979,12 +1972,12 @@ static int sh_eth_set_ringparam(struct net_device *ndev,
|
|||
|
||||
ret = sh_eth_ring_init(ndev);
|
||||
if (ret < 0) {
|
||||
dev_err(&ndev->dev, "%s: sh_eth_ring_init failed.\n", __func__);
|
||||
netdev_err(ndev, "%s: sh_eth_ring_init failed.\n", __func__);
|
||||
return ret;
|
||||
}
|
||||
ret = sh_eth_dev_init(ndev, false);
|
||||
if (ret < 0) {
|
||||
dev_err(&ndev->dev, "%s: sh_eth_dev_init failed.\n", __func__);
|
||||
netdev_err(ndev, "%s: sh_eth_dev_init failed.\n", __func__);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -2025,7 +2018,7 @@ static int sh_eth_open(struct net_device *ndev)
|
|||
ret = request_irq(ndev->irq, sh_eth_interrupt,
|
||||
mdp->cd->irq_flags, ndev->name, ndev);
|
||||
if (ret) {
|
||||
dev_err(&ndev->dev, "Can not assign IRQ number\n");
|
||||
netdev_err(ndev, "Can not assign IRQ number\n");
|
||||
goto out_napi_off;
|
||||
}
|
||||
|
||||
|
|
@ -2063,10 +2056,9 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
|
|||
|
||||
netif_stop_queue(ndev);
|
||||
|
||||
if (netif_msg_timer(mdp)) {
|
||||
dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x, resetting...\n",
|
||||
ndev->name, (int)sh_eth_read(ndev, EESR));
|
||||
}
|
||||
netif_err(mdp, timer, ndev,
|
||||
"transmit timed out, status %8.8x, resetting...\n",
|
||||
(int)sh_eth_read(ndev, EESR));
|
||||
|
||||
/* tx_errors count up */
|
||||
ndev->stats.tx_errors++;
|
||||
|
|
@ -2101,8 +2093,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|||
spin_lock_irqsave(&mdp->lock, flags);
|
||||
if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
|
||||
if (!sh_eth_txfree(ndev)) {
|
||||
if (netif_msg_tx_queued(mdp))
|
||||
dev_warn(&ndev->dev, "TxFD exhausted.\n");
|
||||
netif_warn(mdp, tx_queued, ndev, "TxFD exhausted.\n");
|
||||
netif_stop_queue(ndev);
|
||||
spin_unlock_irqrestore(&mdp->lock, flags);
|
||||
return NETDEV_TX_BUSY;
|
||||
|
|
@ -2272,7 +2263,7 @@ static int sh_eth_tsu_busy(struct net_device *ndev)
|
|||
udelay(10);
|
||||
timeout--;
|
||||
if (timeout <= 0) {
|
||||
dev_err(&ndev->dev, "%s: timeout\n", __func__);
|
||||
netdev_err(ndev, "%s: timeout\n", __func__);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
}
|
||||
|
|
@ -2924,8 +2915,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
/* print device information */
|
||||
pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
|
||||
(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
|
||||
netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n",
|
||||
(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
|
||||
|
||||
platform_set_drvdata(pdev, ndev);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче