Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] ISDN: fix warnings

* diva, sedlbauer: the 'ready' label is only used in certain configurations
* hfc_pci:
- cast 'arg' to proper size for testing and printing
- print out 'void __iomem *' variables with %p,
rather than using incorrect casts that throw warnings

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jeff Garzik and committed by
Linus Torvalds
df61bec3 281f15e6

+13 -5
+4
drivers/isdn/hisax/diva.c
··· 1121 1121 bytecnt = 32; 1122 1122 } 1123 1123 } 1124 + 1125 + #ifdef __ISAPNP__ 1124 1126 ready: 1127 + #endif 1128 + 1125 1129 printk(KERN_INFO 1126 1130 "Diva: %s card configured at %#lx IRQ %d\n", 1127 1131 (cs->subtyp == DIVA_PCI) ? "PCI" :
+5 -5
drivers/isdn/hisax/hfc_pci.c
··· 1211 1211 break; 1212 1212 case (HW_TESTLOOP | REQUEST): 1213 1213 spin_lock_irqsave(&cs->lock, flags); 1214 - switch ((int) arg) { 1214 + switch ((long) arg) { 1215 1215 case (1): 1216 1216 Write_hfc(cs, HFCPCI_B1_SSL, 0x80); /* tx slot */ 1217 1217 Write_hfc(cs, HFCPCI_B1_RSL, 0x80); /* rx slot */ ··· 1229 1229 default: 1230 1230 spin_unlock_irqrestore(&cs->lock, flags); 1231 1231 if (cs->debug & L1_DEB_WARN) 1232 - debugl1(cs, "hfcpci_l1hw loop invalid %4x", (int) arg); 1232 + debugl1(cs, "hfcpci_l1hw loop invalid %4lx", (long) arg); 1233 1233 return; 1234 1234 } 1235 1235 cs->hw.hfcpci.trm |= 0x80; /* enable IOM-loop */ ··· 1711 1711 pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); 1712 1712 cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); 1713 1713 printk(KERN_INFO 1714 - "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n", 1715 - (u_int) cs->hw.hfcpci.pci_io, 1716 - (u_int) cs->hw.hfcpci.fifos, 1714 + "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n", 1715 + cs->hw.hfcpci.pci_io, 1716 + cs->hw.hfcpci.fifos, 1717 1717 (u_int) virt_to_bus(cs->hw.hfcpci.fifos), 1718 1718 cs->irq, HZ); 1719 1719 spin_lock_irqsave(&cs->lock, flags);
+4
drivers/isdn/hisax/sedlbauer.c
··· 677 677 return (0); 678 678 #endif /* CONFIG_PCI */ 679 679 } 680 + 681 + #ifdef __ISAPNP__ 680 682 ready: 683 + #endif 684 + 681 685 /* In case of the sedlbauer pcmcia card, this region is in use, 682 686 * reserved for us by the card manager. So we do not check it 683 687 * here, it would fail.