diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-12-08 05:39:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:01 -0500 |
commit | df61bec3ae8983984070db24ae481fe7297a6dff (patch) | |
tree | 0579a16dde2af018d54a62ae6c693bbbbe28a14a /drivers/isdn/hisax/hfc_pci.c | |
parent | 281f15e6d9bfe18f200119bf8ffcbc67e8a33718 (diff) |
[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>
Diffstat (limited to 'drivers/isdn/hisax/hfc_pci.c')
-rw-r--r-- | drivers/isdn/hisax/hfc_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 5db0a85b827f..8a48a3ce0a55 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c | |||
@@ -1211,7 +1211,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg) | |||
1211 | break; | 1211 | break; |
1212 | case (HW_TESTLOOP | REQUEST): | 1212 | case (HW_TESTLOOP | REQUEST): |
1213 | spin_lock_irqsave(&cs->lock, flags); | 1213 | spin_lock_irqsave(&cs->lock, flags); |
1214 | switch ((int) arg) { | 1214 | switch ((long) arg) { |
1215 | case (1): | 1215 | case (1): |
1216 | Write_hfc(cs, HFCPCI_B1_SSL, 0x80); /* tx slot */ | 1216 | Write_hfc(cs, HFCPCI_B1_SSL, 0x80); /* tx slot */ |
1217 | Write_hfc(cs, HFCPCI_B1_RSL, 0x80); /* rx slot */ | 1217 | Write_hfc(cs, HFCPCI_B1_RSL, 0x80); /* rx slot */ |
@@ -1229,7 +1229,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg) | |||
1229 | default: | 1229 | default: |
1230 | spin_unlock_irqrestore(&cs->lock, flags); | 1230 | spin_unlock_irqrestore(&cs->lock, flags); |
1231 | if (cs->debug & L1_DEB_WARN) | 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 | return; | 1233 | return; |
1234 | } | 1234 | } |
1235 | cs->hw.hfcpci.trm |= 0x80; /* enable IOM-loop */ | 1235 | cs->hw.hfcpci.trm |= 0x80; /* enable IOM-loop */ |
@@ -1711,9 +1711,9 @@ setup_hfcpci(struct IsdnCard *card) | |||
1711 | pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); | 1711 | pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); |
1712 | cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); | 1712 | cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); |
1713 | printk(KERN_INFO | 1713 | printk(KERN_INFO |
1714 | "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n", | 1714 | "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n", |
1715 | (u_int) cs->hw.hfcpci.pci_io, | 1715 | cs->hw.hfcpci.pci_io, |
1716 | (u_int) cs->hw.hfcpci.fifos, | 1716 | cs->hw.hfcpci.fifos, |
1717 | (u_int) virt_to_bus(cs->hw.hfcpci.fifos), | 1717 | (u_int) virt_to_bus(cs->hw.hfcpci.fifos), |
1718 | cs->irq, HZ); | 1718 | cs->irq, HZ); |
1719 | spin_lock_irqsave(&cs->lock, flags); | 1719 | spin_lock_irqsave(&cs->lock, flags); |