[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, 9 deletions

diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index 55de06953540..ca4161798cdf 100644
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -17,8 +17,6 @@
 #include "isdnl1.h"
 #include <linux/isapnp.h>
 
-extern const char *CardType[];
-
 static const char *ISurf_revision = "$Revision: 1.12.2.4 $";
 
 #define byteout(addr,val) outb(val,addr)
@@ -251,22 +249,19 @@ setup_isurf(struct IsdnCard *card)
                         return(0);
                 }
 #else
-                printk(KERN_WARNING "HiSax: %s port/mem not set\n",
-                        CardType[card->typ]);
+                printk(KERN_WARNING "HiSax: Siemens I-Surf port/mem not set\n");
                 return (0);
 #endif
         }
         if (!request_region(cs->hw.isurf.reset, 1, "isurf isdn")) {
                 printk(KERN_WARNING
-                        "HiSax: %s config port %x already in use\n",
-                        CardType[card->typ],
+                        "HiSax: Siemens I-Surf config port %x already in use\n",
                         cs->hw.isurf.reset);
                         return (0);
         }
         if (!request_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE, "isurf iomem")) {
-                printk(KERN_WARNING
-                        "HiSax: %s memory region %lx-%lx already in use\n",
-                        CardType[card->typ],
+                printk(KERN_WARNING "HiSax: Siemens I-Surf memory region "
+                        "%lx-%lx already in use\n",
                         cs->hw.isurf.phymem,
                         cs->hw.isurf.phymem + ISURF_IOMEM_SIZE);
                 release_region(cs->hw.isurf.reset, 1);