[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, 4 insertions, 5 deletions

diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 252d79de5e5e..2d18d4f1e57e 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -24,7 +24,6 @@
 #include "hscx.h"
 #include "isdnl1.h"
 
-extern const char *CardType[];
 static const char *ix1_revision = "$Revision: 2.12.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -288,15 +287,15 @@ setup_ix1micro(struct IsdnCard *card)
         if (cs->hw.ix1.cfg_reg) {
                 if (!request_region(cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) {
                         printk(KERN_WARNING
-                          "HiSax: %s config port %x-%x already in use\n",
-                               CardType[card->typ],
+                          "HiSax: ITK ix1-micro Rev.2 config port "
+                          "%x-%x already in use\n",
                                cs->hw.ix1.cfg_reg,
                                cs->hw.ix1.cfg_reg + 4);
                         return (0);
                 }
         }
-        printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n",
-                CardType[cs->typ], cs->irq, cs->hw.ix1.cfg_reg);
+        printk(KERN_INFO "HiSax: ITK ix1-micro Rev.2 config irq:%d io:0x%X\n",
+                cs->irq, cs->hw.ix1.cfg_reg);
         setup_isac(cs);
         cs->readisac = &ReadISAC;
         cs->writeisac = &WriteISAC;