| Message ID | 5183009.Sb9uPGUboI@iron-maiden |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,v2] drivers: net: Follow the indentation coding standard on printks | expand |
On Thu, 2021-07-08 at 13:33 -0400, Carlos Bilbao wrote: > Fix indentation of printks that start at the beginning of the line. Change this > for the right number of space characters, or tabs if the file uses them. You are touching 2 different drivers and this should really be 2 separate patches. > diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c.rej b/drivers/net/ethernet/dec/tulip/de4x5.c.rej [] > +++ b/drivers/net/ethernet/dec/tulip/de4x5.c.rej > @@ -0,0 +1,11 @@ > +--- drivers/net/ethernet/dec/tulip/de4x5.c > ++++ drivers/net/ethernet/dec/tulip/de4x5.c > +@@ -3169,7 +3169,7 @@ dc2114x_autoconf(struct net_device *dev) > + > + default: > + lp->tcount++; > +-printk("Huh?: media:%02x\n", lp->media); > ++ printk("Huh?: media:%02x\n", lp->media); > + lp->media = INIT; > + break; > + } This is an interdiff that should not be part of this change.
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index b125d7faefdf..0d8ddfdd5c09 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -3169,7 +3169,7 @@ dc2114x_autoconf(struct net_device *dev) default: lp->tcount++; -printk("Huh?: media:%02x\n", lp->media); + printk(KERN_NOTICE "Huh?: media:%02x\n", lp->media); lp->media = INIT; break; } diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c.rej b/drivers/net/ethernet/dec/tulip/de4x5.c.rej new file mode 100644 index 000000000000..949b9902b0bc --- /dev/null +++ b/drivers/net/ethernet/dec/tulip/de4x5.c.rej @@ -0,0 +1,11 @@ +--- drivers/net/ethernet/dec/tulip/de4x5.c ++++ drivers/net/ethernet/dec/tulip/de4x5.c +@@ -3169,7 +3169,7 @@ dc2114x_autoconf(struct net_device *dev) + + default: + lp->tcount++; +-printk("Huh?: media:%02x\n", lp->media); ++ printk("Huh?: media:%02x\n", lp->media); + lp->media = INIT; + break; + } diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index e88af978f63c..a7a6bd7ef015 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c @@ -759,9 +759,6 @@ sb1000_rx(struct net_device *dev) ioaddr = dev->base_addr; insw(ioaddr, (unsigned short*) st, 1); -#ifdef XXXDEBUG -printk("cm0: received: %02x %02x\n", st[0], st[1]); -#endif /* XXXDEBUG */ lp->rx_frames++; /* decide if it is a good or bad frame */ @@ -804,9 +801,6 @@ printk("cm0: received: %02x %02x\n", st[0], st[1]); if (st[0] & 0x40) { /* get data length */ insw(ioaddr, buffer, NewDatagramHeaderSize / 2); -#ifdef XXXDEBUG -printk("cm0: IP identification: %02x%02x fragment offset: %02x%02x\n", buffer[30], buffer[31], buffer[32], buffer[33]); -#endif /* XXXDEBUG */ if (buffer[0] != NewDatagramHeaderSkip) { if (sb1000_debug > 1) printk(KERN_WARNING "%s: new datagram header skip error: "
Fix indentation of printks that start at the beginning of the line. Change this for the right number of space characters, or tabs if the file uses them. Signed-off-by: Carlos Bilbao <bilbao@vt.edu> --- Changelog: v2 - Remove the printks inside XXXDEBUG ---