de2104x: disable media debug messages by default

PATCH Applied Ondrej Zary 4 participants 4 messages Sep 28, 2010 – Sep 30, 2010

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Ondrej Zary

author

2010-09-28 18:18 UTC #0 lore raw

PATCH 1/1 de2104x: disable media debug messages by default

Print media debug messages only when HW debug is enabled.

Signed-off-by Ondrej Zary <[email protected]>

drivers/net/tulip/de2104x.c +2 -1

@@ -948,8 +948,9 @@ static void de_set_media (struct de_priv
 	else
 		macmode &= ~FullDuplex;
 
-	if (netif_msg_link(de)) {
+	if (netif_msg_link(de))
 		dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+	if (netif_msg_hw(de)) {
 		dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
 			 dr32(MacMode), dr32(SIAStatus),
 			 dr32(CSR13), dr32(CSR14), dr32(CSR15));

Signature · 1 line

Ondrej Zary

Jeff Garzik

Acked-by on v1 1/1

2010-09-28 18:51 UTC #1 lore raw

Quoted 7 lines · Ondrej Zary

Print media debug messages only when HW debug is enabled.
Signed-off-by Ondrej Zary<[email protected]>

drivers/net/tulip/de2104x.c static void de_set_media (struct de_priv · line 956

Quoted 10 lines

drivers/net/tulip/de2104x.c +2 -1

@@ -948,8 +948,9 @@ static void de_set_media (struct de_priv
  	else
  		macmode&= ~FullDuplex;
 
-	if (netif_msg_link(de)) {
+	if (netif_msg_link(de))
  		dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+	if (netif_msg_hw(de)) {
  		dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
  			 dr32(MacMode), dr32(SIAStatus),
  			 dr32(CSR13), dr32(CSR14), dr32(CSR15));

Acked-by Jeff Garzik <[email protected]>

David Miller

maintainer Applied

2010-09-30 02:47 UTC #2 lore raw

From: Jeff Garzik <[email protected]>
Date: Tue, 28 Sep 2010 14:51:45 -0400

Quoted 13 lines · Ondrej Zary

Quoted 12 lines
Print media debug messages only when HW debug is enabled.
Signed-off-by Ondrej Zary<[email protected]>
--- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c 2010-09-28
drivers/net/tulip/de2104x.c 2010-09-28 renamed from 19:50:51.000000000 +0200 +0 -0
20:05:34.000000000 +0200
drivers/net/tulip/de2104x.c 2010-09-28 renamed from 19:50:51.000000000 +0200 +0 -0
@@ -948,8 +948,9 @@ static void de_set_media (struct de_priv
  	else
  		macmode&= ~FullDuplex;
 

Quoted 9 lines

drivers/net/tulip/de2104x.c 2010-09-28 static void de_set_media (struct de_priv · line 956
Quoted 7 lines
drivers/net/tulip/de2104x.c 2010-09-28 renamed from 19:50:51.000000000 +0200 +2 -1
-	if (netif_msg_link(de)) {
+	if (netif_msg_link(de))
  		dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+	if (netif_msg_hw(de)) {
  		dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
  			 dr32(MacMode), dr32(SIAStatus),
  			 dr32(CSR13), dr32(CSR14), dr32(CSR15));
Acked-by Jeff Garzik <[email protected]>

Applied to net-next-2.6

Michał Mirosław

2010-09-30 09:46 UTC #3 lore raw

In reply to Ondrej Zary

2010/9/28 Ondrej Zary <[email protected]>:

Quoted 10 lines

Print media debug messages only when HW debug is enabled.
Signed-off-by Ondrej Zary <[email protected]>
drivers/net/tulip/de2104x.c 2010-09-28 20:05:34.000000000 +0200 renamed from drivers/net/tulip/de2104x.c 2010-09-28 19:50:51.000000000 +0200 +0 -0
@@ -948,8 +948,9 @@ static void de_set_media (struct de_priv
else
macmode &= ~FullDuplex;

Quoted 3 lines

- if (netif_msg_link(de)) {
+ if (netif_msg_link(de))
dev_info(&de->dev->dev, "set link %s\n", media_name[media]);

You can use netif_info(de, link, de->dev, ...) instead and get 'ethX:
' prefix for free.

Quoted 4 lines

+ if (netif_msg_hw(de)) {
dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n", dr32(MacMode), dr32(SIAStatus), dr32(CSR13), dr32(CSR14), dr32(CSR15));

Same here.

Best Regards,
Michał Mirosław