The patch titled
bcm43 wireless: fix printk format warnings
has been removed from the -mm tree. Its filename is
bcm43-wireless-fix-printk-format-warnings.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
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: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Acked-by: Michael Buesch <mb@xxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 8 ++++----
drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 13 +++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
diff -puN drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c~bcm43-wireless-fix-printk-format-warnings drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
--- 25/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c~bcm43-wireless-fix-printk-format-warnings Tue Apr 11 15:15:18 2006
+++ 25-akpm/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c Tue Apr 11 15:15:18 2006
@@ -452,12 +452,12 @@ void bcm43xx_printk_dump(const char *dat
size_t i;
char c;
- printk(KERN_INFO PFX "Data dump (%s, %u bytes):",
+ printk(KERN_INFO PFX "Data dump (%s, %zd bytes):",
description, size);
for (i = 0; i < size; i++) {
c = data[i];
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
printk("0x%02x, ", c & 0xff);
}
@@ -472,12 +472,12 @@ void bcm43xx_printk_bitdump(const unsign
int j;
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");
for (i = 0; i < bytes; i++) {
d = data + i;
if (i % 8 == 0)
- printk("\n" KERN_INFO PFX "0x%08x: ", i);
+ printk("\n" KERN_INFO PFX "0x%08zx: ", i);
if (msb_to_lsb) {
for (j = 7; j >= 0; j--) {
if (*d & (1 << j))
diff -puN drivers/net/wireless/bcm43xx/bcm43xx_dma.c~bcm43-wireless-fix-printk-format-warnings drivers/net/wireless/bcm43xx/bcm43xx_dma.c
--- 25/drivers/net/wireless/bcm43xx/bcm43xx_dma.c~bcm43-wireless-fix-printk-format-warnings Tue Apr 11 15:15:18 2006
+++ 25-akpm/drivers/net/wireless/bcm43xx/bcm43xx_dma.c Tue Apr 11 15:15:18 2006
@@ -196,8 +196,9 @@ static int alloc_ringmemory(struct bcm43
}
if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) {
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RINGMEMORY >1G "
- "(0x%08x, len: %lu)\n",
- ring->dmabase, BCM43xx_DMA_RINGMEMSIZE);
+ "(0x%llx, len: %lu)\n",
+ (unsigned long long)ring->dmabase,
+ BCM43xx_DMA_RINGMEMSIZE);
dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
ring->vbase, ring->dmabase);
return -ENOMEM;
@@ -307,8 +308,8 @@ static int setup_rx_descbuffer(struct bc
unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
dev_kfree_skb_any(skb);
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RX SKB >1G "
- "(0x%08x, len: %u)\n",
- dmaaddr, ring->rx_buffersize);
+ "(0x%llx, len: %u)\n",
+ (unsigned long long)dmaaddr, ring->rx_buffersize);
return -ENOMEM;
}
meta->skb = skb;
@@ -729,8 +730,8 @@ static int dma_tx_fragment(struct bcm43x
if (unlikely(meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) {
return_slot(ring, slot);
printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA TX SKB >1G "
- "(0x%08x, len: %u)\n",
- meta->dmaaddr, skb->len);
+ "(0x%llx, len: %u)\n",
+ (unsigned long long)meta->dmaaddr, skb->len);
return -ENOMEM;
}
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
config-exit-if-no-beginning-filename.patch
git-mtd.patch
areca-raid-linux-scsi-driver.patch
git-watchdog.patch
git-wireless.patch
add-poisonh-and-patch-primary-users.patch
update-2-drivers-for-poisonh.patch
tpm_infineon-section-fixup.patch
acpi-identify-which-device-is-not-power-manageable.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
