[ISDN] Hisax: eliminate many unnecessary references to CardType[]

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / telespci.c

diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index dca446865f24b8de70d7afb5f4b9052505ad1652..28b08de4673da9288ac8406c0e7d9976916805c1 100644 (file)
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -19,7 +19,6 @@
 #include "isdnl1.h"
 #include <linux/pci.h>
 
-extern const char *CardType[];
 static const char *telespci_revision = "$Revision: 2.23.2.3 $";
 
 #define ZORAN_PO_RQ_PEN        0x02000000
@@ -226,7 +225,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
 #include "hscx_irq.c"
 
 static irqreturn_t
-telespci_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+telespci_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char hval, ival;
@@ -295,11 +294,12 @@ setup_telespci(struct IsdnCard *card)
 #ifdef __BIG_ENDIAN
 #error "not running on big endian machines now"
 #endif
+
        strcpy(tmp, telespci_revision);
        printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp));
        if (cs->typ != ISDN_CTYPE_TELESPCI)
                return (0);
-#ifdef CONFIG_PCI
+
        if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) {
                if (pci_enable_device(dev_tel))
                        return(0);
@@ -317,11 +317,6 @@ setup_telespci(struct IsdnCard *card)
                printk(KERN_WARNING "TelesPCI: No PCI card found\n");
                return(0);
        }
-#else
-       printk(KERN_WARNING "HiSax: Teles/PCI and NO_PCI_BIOS\n");
-       printk(KERN_WARNING "HiSax: Teles/PCI unable to config\n");
-       return (0);
-#endif /* CONFIG_PCI */
 
        /* Initialize Zoran PCI controller */
        writel(0x00000000, cs->hw.teles0.membase + 0x28);
@@ -333,8 +328,8 @@ setup_telespci(struct IsdnCard *card)
        /* writel(0x00800000, cs->hw.teles0.membase + 0x200); */
 
        printk(KERN_INFO
-              "HiSax: %s config irq:%d mem:%p\n",
-              CardType[cs->typ], cs->irq,
+              "HiSax: Teles PCI config irq:%d mem:%p\n",
+              cs->irq,
               cs->hw.teles0.membase);
 
        setup_isac(cs);