From 12caae4237e5ac72b85265b0fef483f4797a4730 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 12 Jul 2007 02:53:39 -0400 Subject: [PATCH] Fix sloppiness in debug directives Don't use double space as separator. Don't print hex data without leading "0x", except in data dumps and MAC addresses. Add spaces in expressions. Signed-off-by: Pavel Roskin --- at76_usb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/at76_usb.c b/at76_usb.c index 085c1c2..cbf4bda 100644 --- a/at76_usb.c +++ b/at76_usb.c @@ -3063,7 +3063,7 @@ static int at76_iw_handler_set_retry(struct net_device *netdev, struct at76_priv *priv = netdev_priv(netdev); int ret = -EIWCOMMIT; - at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d", + at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d", netdev->name, retry->disabled, retry->flags, retry->value); if (!retry->disabled && (retry->flags & IW_RETRY_LIMIT)) { @@ -3295,7 +3295,7 @@ static int at76_iw_set_debug(struct net_device *netdev, val = DBG_DEFAULTS; } - dbg("%s: AT76_SET_DEBUG, old 0x%x new 0x%x", + dbg("%s: AT76_SET_DEBUG, old 0x%x, new 0x%x", netdev->name, at76_debug, val); /* jal: some more output to pin down lockups */ @@ -3728,7 +3728,7 @@ static int at76_tx(struct sk_buff *skb, struct net_device *netdev) at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", priv->netdev->name, hex2str(skb->data, 32)); - at76_dbg(DBG_TX_DATA, "%s tx wlen 0x%x pad 0x%x rate %d hdr %s", + at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr %s", priv->netdev->name, le16_to_cpu(tx_buffer->wlength), tx_buffer->padding, tx_buffer->tx_rate, @@ -5442,7 +5442,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv) if (i < NR_RX_DATA_BUF) { - at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag=%d/%d) " + at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag = %d/%d) " "matched sender addr", priv->netdev->name, i, bptr->seqnr, bptr->fragnr); @@ -5454,7 +5454,7 @@ static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv) /* wrong fragment number -> ignore it */ /* is & 0xf necessary above ??? */ at76_dbg(DBG_RX_FRAGS, - "%s: frag nr does not match: %d+1 != %d", + "%s: frag nr mismatch: %d + 1 != %d", priv->netdev->name, bptr->fragnr, fragnr); return NULL; @@ -5878,7 +5878,7 @@ static struct fwentry *at76_load_firmware(struct usb_device *udev, fwe->loaded = 1; at76_dbg(DBG_DEVSTART, "firmware board %u version %u.%u.%u#%u " - "(int %x:%x, ext %x:%x)", board_type, + "(int %d:%d, ext %d:%d)", board_type, fwh->major, fwh->minor, fwh->patch, fwh->build, le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len), le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len)); -- cgit v1.2.3