aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkab@cdac.in>2014-07-10 05:59:38 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-10 19:55:22 -0400
commitff32045e7a1ec9eb35dbf057374b1bc5bf99bc1f (patch)
treef1a70c20cef280eaa3adb1a5b14d65b5801a1036
parent51b5bd199a54e9d4bed2b3a9192b07fdf7ce0adb (diff)
net: cpmac: fix in debug messages
This patch fix the debug message format. This patch changes to the commit f160a2d0b524eeebd97a68e2fbb59fad4cdd3fee: net: cpmac: dynamic debug fixes When we use pr_debug()/netdev_dbg() new lines are inserting in b/w the values. The format when i use the printk() These formats used in skb dump and reg dump. This functions called from the entire code. So this will be enabled all the lines. Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ti/cpmac.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index b68c5b588742..3809f4ec2820 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -228,22 +228,22 @@ static void cpmac_dump_regs(struct net_device *dev)
228 for (i = 0; i < CPMAC_REG_END; i += 4) { 228 for (i = 0; i < CPMAC_REG_END; i += 4) {
229 if (i % 16 == 0) { 229 if (i % 16 == 0) {
230 if (i) 230 if (i)
231 pr_cont("\n"); 231 printk("\n");
232 netdev_dbg(dev, "reg[%p]:", priv->regs + i); 232 printk("%s: reg[%p]:", dev->name, priv->regs + i);
233 } 233 }
234 pr_debug(" %08x", cpmac_read(priv->regs, i)); 234 printk(" %08x", cpmac_read(priv->regs, i));
235 } 235 }
236 pr_debug("\n"); 236 printk("\n");
237} 237}
238 238
239static void cpmac_dump_desc(struct net_device *dev, struct cpmac_desc *desc) 239static void cpmac_dump_desc(struct net_device *dev, struct cpmac_desc *desc)
240{ 240{
241 int i; 241 int i;
242 242
243 netdev_dbg(dev, "desc[%p]:", desc); 243 printk("%s: desc[%p]:", dev->name, desc);
244 for (i = 0; i < sizeof(*desc) / 4; i++) 244 for (i = 0; i < sizeof(*desc) / 4; i++)
245 pr_debug(" %08x", ((u32 *)desc)[i]); 245 printk(" %08x", ((u32 *)desc)[i]);
246 pr_debug("\n"); 246 printk("\n");
247} 247}
248 248
249static void cpmac_dump_all_desc(struct net_device *dev) 249static void cpmac_dump_all_desc(struct net_device *dev)
@@ -261,16 +261,16 @@ static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
261{ 261{
262 int i; 262 int i;
263 263
264 netdev_dbg(dev, "skb 0x%p, len=%d\n", skb, skb->len); 264 printk("%s: skb 0x%p, len=%d\n", dev->name, skb, skb->len);
265 for (i = 0; i < skb->len; i++) { 265 for (i = 0; i < skb->len; i++) {
266 if (i % 16 == 0) { 266 if (i % 16 == 0) {
267 if (i) 267 if (i)
268 pr_cont("\n"); 268 printk("\n");
269 netdev_dbg(dev, "data[%p]:", skb->data + i); 269 printk("%s: data[%p]:", dev->name, skb->data + i);
270 } 270 }
271 pr_debug(" %02x", ((u8 *)skb->data)[i]); 271 printk(" %02x", ((u8 *)skb->data)[i]);
272 } 272 }
273 pr_debug("\n"); 273 printk("\n");
274} 274}
275 275
276static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg) 276static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg)