Commit 4c6f749f authored by Randy Dunlap's avatar Randy Dunlap Committed by John W. Linville

[PATCH] bcm43xx wireless: fix printk format warnings

Fix printk format warnings:
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c:456: warning: format ‘%u’ expects type ‘unsigned int’, but argument 3 has type ‘size_t’
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c:460: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘size_t’
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c:476: warning: format ‘%u’ expects type ‘unsigned int’, but argument 3 has type ‘size_t’
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c:480: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘size_t’
drivers/net/wireless/bcm43xx/bcm43xx_dma.c:200: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘dma_addr_t’
drivers/net/wireless/bcm43xx/bcm43xx_dma.c:311: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘dma_addr_t’
drivers/net/wireless/bcm43xx/bcm43xx_dma.c:733: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘dma_addr_t’
Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6788a07f
...@@ -452,12 +452,12 @@ void bcm43xx_printk_dump(const char *data, ...@@ -452,12 +452,12 @@ void bcm43xx_printk_dump(const char *data,
size_t i; size_t i;
char c; char c;
printk(KERN_INFO PFX "Data dump (%s, %u bytes):", printk(KERN_INFO PFX "Data dump (%s, %zd bytes):",
description, size); description, size);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
c = data[i]; c = data[i];
if (i % 8 == 0) if (i % 8 == 0)
printk("\n" KERN_INFO PFX "0x%08x: 0x%02x, ", i, c & 0xff); printk("\n" KERN_INFO PFX "0x%08zx: 0x%02x, ", i, c & 0xff);
else else
printk("0x%02x, ", c & 0xff); printk("0x%02x, ", c & 0xff);
} }
...@@ -472,12 +472,12 @@ void bcm43xx_printk_bitdump(const unsigned char *data, ...@@ -472,12 +472,12 @@ void bcm43xx_printk_bitdump(const unsigned char *data,
int j; int j;
const unsigned char *d; const unsigned char *d;
printk(KERN_INFO PFX "*** Bitdump (%s, %u bytes, %s) ***", printk(KERN_INFO PFX "*** Bitdump (%s, %zd bytes, %s) ***",
description, bytes, msb_to_lsb ? "MSB to LSB" : "LSB to MSB"); description, bytes, msb_to_lsb ? "MSB to LSB" : "LSB to MSB");
for (i = 0; i < bytes; i++) { for (i = 0; i < bytes; i++) {
d = data + i; d = data + i;
if (i % 8 == 0) if (i % 8 == 0)
printk("\n" KERN_INFO PFX "0x%08x: ", i); printk("\n" KERN_INFO PFX "0x%08zx: ", i);
if (msb_to_lsb) { if (msb_to_lsb) {
for (j = 7; j >= 0; j--) { for (j = 7; j >= 0; j--) {
if (*d & (1 << j)) if (*d & (1 << j))
......
...@@ -196,8 +196,9 @@ static int alloc_ringmemory(struct bcm43xx_dmaring *ring) ...@@ -196,8 +196,9 @@ static int alloc_ringmemory(struct bcm43xx_dmaring *ring)
} }
if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) { if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) {
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RINGMEMORY >1G " printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RINGMEMORY >1G "
"(0x%08x, len: %lu)\n", "(0x%llx, len: %lu)\n",
ring->dmabase, BCM43xx_DMA_RINGMEMSIZE); (unsigned long long)ring->dmabase,
BCM43xx_DMA_RINGMEMSIZE);
dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE, dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
ring->vbase, ring->dmabase); ring->vbase, ring->dmabase);
return -ENOMEM; return -ENOMEM;
...@@ -307,8 +308,8 @@ static int setup_rx_descbuffer(struct bcm43xx_dmaring *ring, ...@@ -307,8 +308,8 @@ static int setup_rx_descbuffer(struct bcm43xx_dmaring *ring,
unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0); unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RX SKB >1G " printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RX SKB >1G "
"(0x%08x, len: %u)\n", "(0x%llx, len: %u)\n",
dmaaddr, ring->rx_buffersize); (unsigned long long)dmaaddr, ring->rx_buffersize);
return -ENOMEM; return -ENOMEM;
} }
meta->skb = skb; meta->skb = skb;
...@@ -729,8 +730,8 @@ static int dma_tx_fragment(struct bcm43xx_dmaring *ring, ...@@ -729,8 +730,8 @@ static int dma_tx_fragment(struct bcm43xx_dmaring *ring,
if (unlikely(meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) { if (unlikely(meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) {
return_slot(ring, slot); return_slot(ring, slot);
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA TX SKB >1G " printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA TX SKB >1G "
"(0x%08x, len: %u)\n", "(0x%llx, len: %u)\n",
meta->dmaaddr, skb->len); (unsigned long long)meta->dmaaddr, skb->len);
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment