aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/au1000_eth.c
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-09-08 07:11:45 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-10 00:36:37 -0400
commit215e17be9f390e787cf9b9e5c9020d298b41d513 (patch)
tree831125b7f6e981110f326fc5bcbde47f4c8a7451 /drivers/net/au1000_eth.c
parent18b8e15b0433ac682138ce5d03157ddc28bdf350 (diff)
au1000-eth: fix bad printk usages
Use pr_(info|err) and pr_cont where required instead of calls to printk. Add missing pr_fmt to the driver. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/au1000_eth.c')
-rw-r--r--drivers/net/au1000_eth.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index a2d86cf62760..f758b60eea22 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -34,6 +34,8 @@
34 * 34 *
35 * 35 *
36 */ 36 */
37#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
38
37#include <linux/capability.h> 39#include <linux/capability.h>
38#include <linux/dma-mapping.h> 40#include <linux/dma-mapping.h>
39#include <linux/module.h> 41#include <linux/module.h>
@@ -720,24 +722,26 @@ static int au1000_rx(struct net_device *dev)
720 netif_rx(skb); /* pass the packet to upper layers */ 722 netif_rx(skb); /* pass the packet to upper layers */
721 } else { 723 } else {
722 if (au1000_debug > 4) { 724 if (au1000_debug > 4) {
725 pr_err("rx_error(s):");
723 if (status & RX_MISSED_FRAME) 726 if (status & RX_MISSED_FRAME)
724 printk("rx miss\n"); 727 pr_cont(" miss");
725 if (status & RX_WDOG_TIMER) 728 if (status & RX_WDOG_TIMER)
726 printk("rx wdog\n"); 729 pr_cont(" wdog");
727 if (status & RX_RUNT) 730 if (status & RX_RUNT)
728 printk("rx runt\n"); 731 pr_cont(" runt");
729 if (status & RX_OVERLEN) 732 if (status & RX_OVERLEN)
730 printk("rx overlen\n"); 733 pr_cont(" overlen");
731 if (status & RX_COLL) 734 if (status & RX_COLL)
732 printk("rx coll\n"); 735 pr_cont(" coll");
733 if (status & RX_MII_ERROR) 736 if (status & RX_MII_ERROR)
734 printk("rx mii error\n"); 737 pr_cont(" mii error");
735 if (status & RX_CRC_ERROR) 738 if (status & RX_CRC_ERROR)
736 printk("rx crc error\n"); 739 pr_cont(" crc error");
737 if (status & RX_LEN_ERROR) 740 if (status & RX_LEN_ERROR)
738 printk("rx len error\n"); 741 pr_cont(" len error");
739 if (status & RX_U_CNTRL_FRAME) 742 if (status & RX_U_CNTRL_FRAME)
740 printk("rx u control frame\n"); 743 pr_cont(" u control frame");
744 pr_cont("\n");
741 } 745 }
742 } 746 }
743 prxd->buff_stat = (u32)(pDB->dma_addr | RX_DMA_ENABLE); 747 prxd->buff_stat = (u32)(pDB->dma_addr | RX_DMA_ENABLE);
@@ -1199,7 +1203,8 @@ static int __devinit au1000_probe(struct platform_device *pdev)
1199 netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n", 1203 netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n",
1200 (unsigned long)base->start, irq); 1204 (unsigned long)base->start, irq);
1201 if (version_printed++ == 0) 1205 if (version_printed++ == 0)
1202 printk("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR); 1206 pr_info("%s version %s %s\n",
1207 DRV_NAME, DRV_VERSION, DRV_AUTHOR);
1203 1208
1204 return 0; 1209 return 0;
1205 1210