Commit df61bec3 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

[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: default avatarJeff Garzik <jeff@garzik.org>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 281f15e6

drivers/isdn/hisax/diva.c

+4 −0
Original line number Diff line number Diff line
@@ -1121,7 +1121,11 @@ setup_diva(struct IsdnCard *card) 
			bytecnt = 32;

		}

	}



#ifdef __ISAPNP__

ready:

#endif



	printk(KERN_INFO

		"Diva: %s card configured at %#lx IRQ %d\n",

		(cs->subtyp == DIVA_PCI) ? "PCI" :

drivers/isdn/hisax/hfc_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg) 
			break;

		case (HW_TESTLOOP | REQUEST):

			spin_lock_irqsave(&cs->lock, flags);

			switch ((int) arg) {

			switch ((long) arg) {

				case (1):

					Write_hfc(cs, HFCPCI_B1_SSL, 0x80);	/* tx slot */

					Write_hfc(cs, HFCPCI_B1_RSL, 0x80);	/* rx slot */
@@ -1229,7 +1229,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg) 
				default:

					spin_unlock_irqrestore(&cs->lock, flags);

					if (cs->debug & L1_DEB_WARN)

						debugl1(cs, "hfcpci_l1hw loop invalid %4x", (int) arg);

						debugl1(cs, "hfcpci_l1hw loop invalid %4lx", (long) arg);

					return;

			}

			cs->hw.hfcpci.trm |= 0x80;	/* enable IOM-loop */
@@ -1711,9 +1711,9 @@ setup_hfcpci(struct IsdnCard *card) 
		pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos));

		cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256);

		printk(KERN_INFO

		       "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n",

		       (u_int) cs->hw.hfcpci.pci_io,

		       (u_int) cs->hw.hfcpci.fifos,

		       "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n",

		       cs->hw.hfcpci.pci_io,

		       cs->hw.hfcpci.fifos,

		       (u_int) virt_to_bus(cs->hw.hfcpci.fifos),

		       cs->irq, HZ);

		spin_lock_irqsave(&cs->lock, flags);

drivers/isdn/hisax/sedlbauer.c

+4 −0
Original line number Diff line number Diff line
@@ -677,7 +677,11 @@ setup_sedlbauer(struct IsdnCard *card) 
		return (0);

#endif /* CONFIG_PCI */

	}	



#ifdef __ISAPNP__

ready:	

#endif



	/* In case of the sedlbauer pcmcia card, this region is in use,

	 * reserved for us by the card manager. So we do not check it

	 * here, it would fail.