* [PATCH 0/3] Beautify 'sh_eth' driver's messages @ 2014-03-15 0:21 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-14 23:21 UTC (permalink / raw) To: netdev; +Cc: linux-sh Hello. This patchset converts te driver to using netdev_*() and netif_*() to print out its messages whenever possible. [1/3] sh_eth: convert pr_*() to netdev_*() calls [2/3] sh_eth: convert dev_*() to netdev_*() calls [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations WBR, Sergei ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 0/3] Beautify 'sh_eth' driver's messages @ 2014-03-15 0:21 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-15 0:21 UTC (permalink / raw) To: netdev; +Cc: linux-sh Hello. This patchset converts te driver to using netdev_*() and netif_*() to print out its messages whenever possible. [1/3] sh_eth: convert pr_*() to netdev_*() calls [2/3] sh_eth: convert dev_*() to netdev_*() calls [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations WBR, Sergei ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/3] Beautify 'sh_eth' driver's messages 2014-03-15 0:21 ` Sergei Shtylyov @ 2014-03-15 0:24 ` Sergei Shtylyov -1 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-14 23:24 UTC (permalink / raw) To: netdev; +Cc: linux-sh On 03/15/2014 03:21 AM, Sergei Shtylyov wrote: > This patchset converts te driver to using netdev_*() and netif_*() to print out > its messages whenever possible. Oops, forgot to mention it's against 'net-next.git' repo and the fix I've just posted. > [1/3] sh_eth: convert pr_*() to netdev_*() calls > [2/3] sh_eth: convert dev_*() to netdev_*() calls > [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations WBR, Sergei ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/3] Beautify 'sh_eth' driver's messages @ 2014-03-15 0:24 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-15 0:24 UTC (permalink / raw) To: netdev; +Cc: linux-sh On 03/15/2014 03:21 AM, Sergei Shtylyov wrote: > This patchset converts te driver to using netdev_*() and netif_*() to print out > its messages whenever possible. Oops, forgot to mention it's against 'net-next.git' repo and the fix I've just posted. > [1/3] sh_eth: convert pr_*() to netdev_*() calls > [2/3] sh_eth: convert dev_*() to netdev_*() calls > [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations WBR, Sergei ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] sh_eth: convert pr_*() to netdev_*() calls 2014-03-15 0:21 ` Sergei Shtylyov @ 2014-03-15 0:27 ` Sergei Shtylyov -1 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-14 23:27 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Convert pr_*() to netdev_*() calls as the latter provide info on a device. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -400,7 +400,8 @@ static void sh_eth_select_mii(struct net 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 cnt--; } if (cnt <= 0) { - pr_err("Device reset failed\n"); + netdev_err(ndev, "Device reset failed\n"); ret = -ETIMEDOUT; } return ret; @@ -2924,8 +2925,8 @@ static int sh_eth_drv_probe(struct platf } /* 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); ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/3] sh_eth: convert pr_*() to netdev_*() calls @ 2014-03-15 0:27 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-15 0:27 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Convert pr_*() to netdev_*() calls as the latter provide info on a device. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -400,7 +400,8 @@ static void sh_eth_select_mii(struct net 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 cnt--; } if (cnt <= 0) { - pr_err("Device reset failed\n"); + netdev_err(ndev, "Device reset failed\n"); ret = -ETIMEDOUT; } return ret; @@ -2924,8 +2925,8 @@ static int sh_eth_drv_probe(struct platf } /* 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); ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] sh_eth: convert dev_*() to netdev_*() calls 2014-03-15 0:21 ` Sergei Shtylyov @ 2014-03-15 0:29 ` Sergei Shtylyov -1 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-14 23:29 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Convert dev_*(&ndev->dev, ...) to netdev_*(ndev, ...) calls since they are a bit shorter and at the same time give more information on a device. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 47 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1558,7 +1558,7 @@ ignore_link: 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"); + netdev_err(ndev, "Transmit Abort\n"); } } @@ -1568,7 +1568,7 @@ ignore_link: /* Receive Frame Overflow int */ ndev->stats.rx_frame_errors++; if (netif_msg_rx_err(mdp)) - dev_err(&ndev->dev, "Receive Abort\n"); + netdev_err(ndev, "Receive Abort\n"); } } @@ -1576,14 +1576,14 @@ ignore_link: /* Transmit Descriptor Empty int */ ndev->stats.tx_fifo_errors++; if (netif_msg_tx_err(mdp)) - dev_err(&ndev->dev, "Transmit Descriptor Empty\n"); + netdev_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"); + netdev_err(ndev, "Transmit FIFO Under flow\n"); } if (intr_status & EESR_RDE) { @@ -1591,21 +1591,21 @@ ignore_link: ndev->stats.rx_over_errors++; if (netif_msg_rx_err(mdp)) - dev_err(&ndev->dev, "Receive Descriptor Empty\n"); + netdev_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"); + netdev_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"); + netdev_err(ndev, "Address Error\n"); } mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE; @@ -1616,9 +1616,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); @@ -1663,9 +1663,9 @@ static irqreturn_t sh_eth_interrupt(int 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); } } @@ -1794,12 +1794,12 @@ static int sh_eth_phy_init(struct net_de } 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; @@ -1980,12 +1980,12 @@ static int sh_eth_set_ringparam(struct n 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; } @@ -2026,7 +2026,7 @@ static int sh_eth_open(struct net_device 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; } @@ -2065,8 +2065,9 @@ static void sh_eth_tx_timeout(struct net 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)); + netdev_err(ndev, + "transmit timed out, status %8.8x, resetting...\n", + (int)sh_eth_read(ndev, EESR)); } /* tx_errors count up */ @@ -2103,7 +2104,7 @@ static int sh_eth_start_xmit(struct sk_b 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"); + netdev_warn(ndev, "TxFD exhausted.\n"); netif_stop_queue(ndev); spin_unlock_irqrestore(&mdp->lock, flags); return NETDEV_TX_BUSY; @@ -2273,7 +2274,7 @@ static int sh_eth_tsu_busy(struct net_de udelay(10); timeout--; if (timeout <= 0) { - dev_err(&ndev->dev, "%s: timeout\n", __func__); + netdev_err(ndev, "%s: timeout\n", __func__); return -ETIMEDOUT; } } ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] sh_eth: convert dev_*() to netdev_*() calls @ 2014-03-15 0:29 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-15 0:29 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Convert dev_*(&ndev->dev, ...) to netdev_*(ndev, ...) calls since they are a bit shorter and at the same time give more information on a device. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 47 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1558,7 +1558,7 @@ ignore_link: 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"); + netdev_err(ndev, "Transmit Abort\n"); } } @@ -1568,7 +1568,7 @@ ignore_link: /* Receive Frame Overflow int */ ndev->stats.rx_frame_errors++; if (netif_msg_rx_err(mdp)) - dev_err(&ndev->dev, "Receive Abort\n"); + netdev_err(ndev, "Receive Abort\n"); } } @@ -1576,14 +1576,14 @@ ignore_link: /* Transmit Descriptor Empty int */ ndev->stats.tx_fifo_errors++; if (netif_msg_tx_err(mdp)) - dev_err(&ndev->dev, "Transmit Descriptor Empty\n"); + netdev_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"); + netdev_err(ndev, "Transmit FIFO Under flow\n"); } if (intr_status & EESR_RDE) { @@ -1591,21 +1591,21 @@ ignore_link: ndev->stats.rx_over_errors++; if (netif_msg_rx_err(mdp)) - dev_err(&ndev->dev, "Receive Descriptor Empty\n"); + netdev_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"); + netdev_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"); + netdev_err(ndev, "Address Error\n"); } mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE; @@ -1616,9 +1616,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); @@ -1663,9 +1663,9 @@ static irqreturn_t sh_eth_interrupt(int 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); } } @@ -1794,12 +1794,12 @@ static int sh_eth_phy_init(struct net_de } 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; @@ -1980,12 +1980,12 @@ static int sh_eth_set_ringparam(struct n 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; } @@ -2026,7 +2026,7 @@ static int sh_eth_open(struct net_device 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; } @@ -2065,8 +2065,9 @@ static void sh_eth_tx_timeout(struct net 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)); + netdev_err(ndev, + "transmit timed out, status %8.8x, resetting...\n", + (int)sh_eth_read(ndev, EESR)); } /* tx_errors count up */ @@ -2103,7 +2104,7 @@ static int sh_eth_start_xmit(struct sk_b 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"); + netdev_warn(ndev, "TxFD exhausted.\n"); netif_stop_queue(ndev); spin_unlock_irqrestore(&mdp->lock, flags); return NETDEV_TX_BUSY; @@ -2273,7 +2274,7 @@ static int sh_eth_tsu_busy(struct net_de udelay(10); timeout--; if (timeout <= 0) { - dev_err(&ndev->dev, "%s: timeout\n", __func__); + netdev_err(ndev, "%s: timeout\n", __func__); return -ETIMEDOUT; } } ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] sh_eth: fold netif_msg_*() and netdev_*() calls into netif_*() invocations 2014-03-15 0:21 ` Sergei Shtylyov @ 2014-03-15 0:30 ` Sergei Shtylyov -1 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-14 23:31 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Now that we call netdev_*() under netif_msg_*() checks, we can fold these into netif_*() macro invocations. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1557,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)) - netdev_err(ndev, "Transmit Abort\n"); + netif_err(mdp, tx_err, ndev, "Transmit Abort\n"); } } @@ -1567,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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "Address Error\n"); + netif_err(mdp, tx_err, ndev, "Address Error\n"); } mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE; @@ -2064,11 +2056,9 @@ static void sh_eth_tx_timeout(struct net netif_stop_queue(ndev); - if (netif_msg_timer(mdp)) { - netdev_err(ndev, - "transmit timed out, status %8.8x, resetting...\n", - (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++; @@ -2103,8 +2093,7 @@ static int sh_eth_start_xmit(struct sk_b 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)) - netdev_warn(ndev, "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; ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/3] sh_eth: fold netif_msg_*() and netdev_*() calls into netif_*() invocations @ 2014-03-15 0:30 ` Sergei Shtylyov 0 siblings, 0 replies; 12+ messages in thread From: Sergei Shtylyov @ 2014-03-15 0:30 UTC (permalink / raw) To: netdev; +Cc: linux-sh, joe Now that we call netdev_*() under netif_msg_*() checks, we can fold these into netif_*() macro invocations. Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/net/ethernet/renesas/sh_eth.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -1557,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)) - netdev_err(ndev, "Transmit Abort\n"); + netif_err(mdp, tx_err, ndev, "Transmit Abort\n"); } } @@ -1567,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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "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)) - netdev_err(ndev, "Address Error\n"); + netif_err(mdp, tx_err, ndev, "Address Error\n"); } mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE; @@ -2064,11 +2056,9 @@ static void sh_eth_tx_timeout(struct net netif_stop_queue(ndev); - if (netif_msg_timer(mdp)) { - netdev_err(ndev, - "transmit timed out, status %8.8x, resetting...\n", - (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++; @@ -2103,8 +2093,7 @@ static int sh_eth_start_xmit(struct sk_b 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)) - netdev_warn(ndev, "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; ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/3] Beautify 'sh_eth' driver's messages 2014-03-15 0:21 ` Sergei Shtylyov @ 2014-03-17 20:07 ` David Miller -1 siblings, 0 replies; 12+ messages in thread From: David Miller @ 2014-03-17 20:07 UTC (permalink / raw) To: sergei.shtylyov; +Cc: netdev, linux-sh From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Date: Sat, 15 Mar 2014 03:21:47 +0300 > This patchset converts te driver to using netdev_*() and netif_*() to print out > its messages whenever possible. > > [1/3] sh_eth: convert pr_*() to netdev_*() calls > [2/3] sh_eth: convert dev_*() to netdev_*() calls > [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations Series applied to net-next, thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/3] Beautify 'sh_eth' driver's messages @ 2014-03-17 20:07 ` David Miller 0 siblings, 0 replies; 12+ messages in thread From: David Miller @ 2014-03-17 20:07 UTC (permalink / raw) To: sergei.shtylyov; +Cc: netdev, linux-sh From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Date: Sat, 15 Mar 2014 03:21:47 +0300 > This patchset converts te driver to using netdev_*() and netif_*() to print out > its messages whenever possible. > > [1/3] sh_eth: convert pr_*() to netdev_*() calls > [2/3] sh_eth: convert dev_*() to netdev_*() calls > [3/3] sh_eth: fold netif_msg_*() and dev_*() calls into netif_*() invocations Series applied to net-next, thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-03-17 20:07 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-14 23:21 [PATCH 0/3] Beautify 'sh_eth' driver's messages Sergei Shtylyov 2014-03-15 0:21 ` Sergei Shtylyov 2014-03-14 23:24 ` Sergei Shtylyov 2014-03-15 0:24 ` Sergei Shtylyov 2014-03-14 23:27 ` [PATCH 1/3] sh_eth: convert pr_*() to netdev_*() calls Sergei Shtylyov 2014-03-15 0:27 ` Sergei Shtylyov 2014-03-14 23:29 ` [PATCH 2/3] sh_eth: convert dev_*() " Sergei Shtylyov 2014-03-15 0:29 ` Sergei Shtylyov 2014-03-14 23:31 ` [PATCH 3/3] sh_eth: fold netif_msg_*() and netdev_*() calls into netif_*() invocations Sergei Shtylyov 2014-03-15 0:30 ` Sergei Shtylyov 2014-03-17 20:07 ` [PATCH 0/3] Beautify 'sh_eth' driver's messages David Miller 2014-03-17 20:07 ` David Miller
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.