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

For the vast majority of CardType[card->typ] uses (but not all!),
the string is constant for each driver.  Therefore, we may replace
CardType[card->typ] with the actual string describing the driver, making
each printk() a bit more simple.

This also has the nice, intended side effect of greatly reducing
external references to hisax global CardType[].  This will be of value
once the ISDN drivers are converted to the ISA/PCI/PNP hotplug APIs.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index c99b16690fb3..b34a81d655b8 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -18,7 +18,6 @@
 #include "hscx.h"
 #include "isdnl1.h"
 
-extern const char *CardType[];
 static char *saphir_rev = "$Revision: 1.10.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -260,15 +259,14 @@ setup_saphir(struct IsdnCard *card)
         cs->irq = card->para[0];
         if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) {
                 printk(KERN_WARNING
-                        "HiSax: %s config port %x-%x already in use\n",
-                        CardType[card->typ],
+                        "HiSax: HST Saphir config port %x-%x already in use\n",
                         cs->hw.saphir.cfg_reg,
                         cs->hw.saphir.cfg_reg + 5);
                 return (0);
         }
 
-        printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n",
-                CardType[cs->typ], cs->irq, cs->hw.saphir.cfg_reg);
+        printk(KERN_INFO "HiSax: HST Saphir config irq:%d io:0x%X\n",
+               cs->irq, cs->hw.saphir.cfg_reg);
 
         setup_isac(cs);
         cs->hw.saphir.timer.function = (void *) SaphirWatchDog;