| Message ID | 1369734966-29026-1-git-send-email-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 28-05-2013 13:56, Andy Shevchenko wrote: > Instead of dereferencing pointer and put values on stack we could use nice > %*phC specifier. > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/net/usb/kalmia.c | 46 ++++++++++++++++------------------------------ > 1 file changed, 16 insertions(+), 30 deletions(-) > diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c > index 0192073..13ecfc5 100644 > --- a/drivers/net/usb/kalmia.c > +++ b/drivers/net/usb/kalmia.c [...] > @@ -263,32 +260,24 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp( > header_start, EXPECTED_UNKNOWN_HEADER_2, > sizeof(EXPECTED_UNKNOWN_HEADER_2))) { > - netdev_dbg( > - dev->net, > - "Received expected unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > - header_start[0], header_start[1], > - header_start[2], header_start[3], > - header_start[4], header_start[5], > + netdev_dbg(dev->net, > + "Received expected unknown frame " > + "header: %6phC. Package length: %i\n", Message strings shouldn't be broken, despite 80 chars limit (there's an exception for them in checkpatch.pl). > + header_start, > skb->len - KALMIA_HEADER_LENGTH); > } > else { > - netdev_err( > - dev->net, > - "Received unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > - header_start[0], header_start[1], > - header_start[2], header_start[3], > - header_start[4], header_start[5], > + netdev_err(dev->net, > + "Received unknown frame header: %6phC. " > + "Package length: %i\n", header_start, Same here... > skb->len - KALMIA_HEADER_LENGTH); > return 0; > } > } [...] > @@ -310,12 +299,9 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > sizeof(HEADER_END_OF_USB_PACKET)) == 0); > if (!is_last) { > header_start = skb->data + ether_packet_length; > - netdev_dbg( > - dev->net, > - "End header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > - header_start[0], header_start[1], > - header_start[2], header_start[3], > - header_start[4], header_start[5], > + netdev_dbg(dev->net, > + "End header: %6phC. Package length: %i" > + "\n", header_start, ... and here. WBR, Sergei -- 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
On Tue, May 28, 2013 at 9:14 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 28-05-2013 13:56, Andy Shevchenko wrote: >> @@ -263,32 +260,24 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff >> *skb) >> sizeof(EXPECTED_UNKNOWN_HEADER_1)) || >> !memcmp( >> header_start, EXPECTED_UNKNOWN_HEADER_2, >> sizeof(EXPECTED_UNKNOWN_HEADER_2))) { >> - netdev_dbg( >> - dev->net, >> - "Received expected unknown frame >> header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", >> - header_start[0], header_start[1], >> - header_start[2], header_start[3], >> - header_start[4], header_start[5], >> + netdev_dbg(dev->net, >> + "Received expected unknown frame " >> + "header: %6phC. Package length: >> %i\n", > > Message strings shouldn't be broken, despite 80 chars limit (there's an > exception for them in checkpatch.pl). I'm glad to hear that checkpatch.pl is eventually fixed. Will send patch v2 tomorrow. -- With Best Regards, Andy Shevchenko -- 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
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c index 0192073..13ecfc5 100644 --- a/drivers/net/usb/kalmia.c +++ b/drivers/net/usb/kalmia.c @@ -221,12 +221,9 @@ done: memset(skb_put(skb, padlen), 0, padlen); } - netdev_dbg( - dev->net, - "Sending package with length %i and padding %i. Header: %02x:%02x:%02x:%02x:%02x:%02x.", - content_len, padlen, header_start[0], header_start[1], - header_start[2], header_start[3], header_start[4], - header_start[5]); + netdev_dbg(dev->net, + "Sending package with length %i and padding %i. Header: %6phC.", + content_len, padlen, header_start); return skb; } @@ -263,32 +260,24 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp( header_start, EXPECTED_UNKNOWN_HEADER_2, sizeof(EXPECTED_UNKNOWN_HEADER_2))) { - netdev_dbg( - dev->net, - "Received expected unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", - header_start[0], header_start[1], - header_start[2], header_start[3], - header_start[4], header_start[5], + netdev_dbg(dev->net, + "Received expected unknown frame " + "header: %6phC. Package length: %i\n", + header_start, skb->len - KALMIA_HEADER_LENGTH); } else { - netdev_err( - dev->net, - "Received unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", - header_start[0], header_start[1], - header_start[2], header_start[3], - header_start[4], header_start[5], + netdev_err(dev->net, + "Received unknown frame header: %6phC. " + "Package length: %i\n", header_start, skb->len - KALMIA_HEADER_LENGTH); return 0; } } else - netdev_dbg( - dev->net, - "Received header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", - header_start[0], header_start[1], header_start[2], - header_start[3], header_start[4], header_start[5], - skb->len - KALMIA_HEADER_LENGTH); + netdev_dbg(dev->net, + "Received header: %6phC. Package length: %i\n", + header_start, skb->len - KALMIA_HEADER_LENGTH); /* subtract start header and end header */ usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH); @@ -310,12 +299,9 @@ kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) sizeof(HEADER_END_OF_USB_PACKET)) == 0); if (!is_last) { header_start = skb->data + ether_packet_length; - netdev_dbg( - dev->net, - "End header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", - header_start[0], header_start[1], - header_start[2], header_start[3], - header_start[4], header_start[5], + netdev_dbg(dev->net, + "End header: %6phC. Package length: %i" + "\n", header_start, skb->len - KALMIA_HEADER_LENGTH); } }
Instead of dereferencing pointer and put values on stack we could use nice %*phC specifier. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/net/usb/kalmia.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-)