netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] de2104x: disable media debug messages by default
@ 2010-09-28 18:18 Ondrej Zary
  2010-09-28 18:51 ` Jeff Garzik
  2010-09-30  9:46 ` Michał Mirosław
  0 siblings, 2 replies; 4+ messages in thread
From: Ondrej Zary @ 2010-09-28 18:18 UTC (permalink / raw)
  To: jgarzik; +Cc: netdev, Kernel development list

Print media debug messages only when HW debug is enabled.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

--- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c	2010-09-28 19:50:51.000000000 +0200
+++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c	2010-09-28 20:05:34.000000000 +0200
@@ -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));


-- 
Ondrej Zary

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] de2104x: disable media debug messages by default
  2010-09-28 18:18 [PATCH] de2104x: disable media debug messages by default Ondrej Zary
@ 2010-09-28 18:51 ` Jeff Garzik
  2010-09-30  2:47   ` David Miller
  2010-09-30  9:46 ` Michał Mirosław
  1 sibling, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2010-09-28 18:51 UTC (permalink / raw)
  To: Ondrej Zary; +Cc: netdev, Kernel development list

On 09/28/2010 02:18 PM, Ondrej Zary wrote:
> Print media debug messages only when HW debug is enabled.
>
> Signed-off-by: Ondrej Zary<linux@rainbow-software.org>
>
> --- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c	2010-09-28 19:50:51.000000000 +0200
> +++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c	2010-09-28 20:05:34.000000000 +0200
> @@ -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 <jgarzik@redhat.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] de2104x: disable media debug messages by default
  2010-09-28 18:51 ` Jeff Garzik
@ 2010-09-30  2:47   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2010-09-30  2:47 UTC (permalink / raw)
  To: jgarzik; +Cc: linux, netdev, linux-kernel

From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 28 Sep 2010 14:51:45 -0400

> On 09/28/2010 02:18 PM, Ondrej Zary wrote:
>> Print media debug messages only when HW debug is enabled.
>>
>> Signed-off-by: Ondrej Zary<linux@rainbow-software.org>
>>
>> --- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c 2010-09-28
>> --- 19:50:51.000000000 +0200
>> +++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c 2010-09-28
>> 20:05:34.000000000 +0200
>> @@ -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 <jgarzik@redhat.com>

Applied to net-next-2.6

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] de2104x: disable media debug messages by default
  2010-09-28 18:18 [PATCH] de2104x: disable media debug messages by default Ondrej Zary
  2010-09-28 18:51 ` Jeff Garzik
@ 2010-09-30  9:46 ` Michał Mirosław
  1 sibling, 0 replies; 4+ messages in thread
From: Michał Mirosław @ 2010-09-30  9:46 UTC (permalink / raw)
  To: Ondrej Zary; +Cc: jgarzik, netdev, Kernel development list

2010/9/28 Ondrej Zary <linux@rainbow-software.org>:
> Print media debug messages only when HW debug is enabled.
>
> Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
>
> --- linux-2.6.36-rc3-/drivers/net/tulip/de2104x.c       2010-09-28 19:50:51.000000000 +0200
> +++ linux-2.6.36-rc3/drivers/net/tulip/de2104x.c        2010-09-28 20:05:34.000000000 +0200
> @@ -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]);

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

> +       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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-09-30  9:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 18:18 [PATCH] de2104x: disable media debug messages by default Ondrej Zary
2010-09-28 18:51 ` Jeff Garzik
2010-09-30  2:47   ` David Miller
2010-09-30  9:46 ` Michał Mirosław

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).