| Submitter | Florian Fainelli |
|---|---|
| Date | Aug. 9, 2010, 8:03 p.m. |
| Message ID | <201008092203.41338.florian@openwrt.org> |
| Download | mbox | patch |
| Permalink | /patch/61317/ |
| State | Superseded |
| Delegated to: | David Miller |
| Headers | show |
Comments
On Mon, 2010-08-09 at 22:03 +0200, Florian Fainelli wrote: > Use pr_(info|err) and pr_cont where required instead of calls to printk. > > Signed-off-by: Florian Fainelli <florian@openwrt.org> > --- > diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c > index 9a0515d..f8f1f5e 100644 > --- a/drivers/net/au1000_eth.c > +++ b/drivers/net/au1000_eth.c > @@ -732,24 +732,25 @@ static int au1000_rx(struct net_device *dev) > netif_rx(skb); /* pass the packet to upper layers */ > } else { > if (au1000_debug > 4) { > + pr_err("rx_error: "); This should be: pr_err("rx_error(s):"); > if (status & RX_MISSED_FRAME) > - printk("rx miss\n"); > + pr_cont("rx miss\n"); These blocks should be "pr_cont(" value"); with a leading space and without the "\n" > if (status & RX_WDOG_TIMER) > - printk("rx wdog\n"); > + pr_cont("rx wdog\n"); [etc] > if (status & RX_U_CNTRL_FRAME) > - printk("rx u control frame\n"); > + pr_cont("rx u control frame\n"); and finally a pr_cont("\n"); It'd also be good to add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt before any #include -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 9a0515d..f8f1f5e 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -732,24 +732,25 @@ static int au1000_rx(struct net_device *dev) netif_rx(skb); /* pass the packet to upper layers */ } else { if (au1000_debug > 4) { + pr_err("rx_error: "); if (status & RX_MISSED_FRAME) - printk("rx miss\n"); + pr_cont("rx miss\n"); if (status & RX_WDOG_TIMER) - printk("rx wdog\n"); + pr_cont("rx wdog\n"); if (status & RX_RUNT) - printk("rx runt\n"); + pr_cont("rx runt\n"); if (status & RX_OVERLEN) - printk("rx overlen\n"); + pr_cont("rx overlen\n"); if (status & RX_COLL) - printk("rx coll\n"); + pr_cont("rx coll\n"); if (status & RX_MII_ERROR) - printk("rx mii error\n"); + pr_cont("rx mii error\n"); if (status & RX_CRC_ERROR) - printk("rx crc error\n"); + pr_cont("rx crc error\n"); if (status & RX_LEN_ERROR) - printk("rx len error\n"); + pr_cont("rx len error\n"); if (status & RX_U_CNTRL_FRAME) - printk("rx u control frame\n"); + pr_cont("rx u control frame\n"); } } prxd->buff_stat = (u32)(pDB->dma_addr | RX_DMA_ENABLE); @@ -1225,7 +1226,8 @@ static int __devinit au1000_probe(struct platform_device *pdev) netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n", (unsigned long)base->start, irq); if (version_printed++ == 0) - printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); + pr_info("%s version %s %s\n", + DRV_NAME, DRV_VERSION, DRV_AUTHOR); return 0;
Use pr_(info|err) and pr_cont where required instead of calls to printk. Signed-off-by: Florian Fainelli <florian@openwrt.org> --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html