Patchwork de2104x: disable media debug messages by default

login
register
mail settings
Submitter Ondrej Zary
Date Sept. 28, 2010, 6:18 p.m.
Message ID <201009282018.57547.linux@rainbow-software.org>
Download mbox | patch
Permalink /patch/66010/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ondrej Zary - Sept. 28, 2010, 6:18 p.m.
Print media debug messages only when HW debug is enabled.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Jeff Garzik - Sept. 28, 2010, 6:51 p.m.
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>


--
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
David Miller - Sept. 30, 2010, 2:47 a.m.
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
--
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
=?ISO-8859-2?Q?Micha=B3_Miros=B3aw?= - Sept. 30, 2010, 9:46 a.m.
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
--
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

--- 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));