aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/mic.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-31 03:42:07 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-20 18:22:31 -0400
commit8349304d12cf1313bdbd6eb2083701d86809be24 (patch)
tree599d43c202cda35b80966d9f364559484ca4145a /drivers/isdn/hisax/mic.c
parentd38c8475b4f3a684ac673dcedc88ffdb17b74882 (diff)
[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>
Diffstat (limited to 'drivers/isdn/hisax/mic.c')
-rw-r--r--drivers/isdn/hisax/mic.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index a81d175d9f64..253943029d25 100644
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -16,8 +16,6 @@
16#include "hscx.h" 16#include "hscx.h"
17#include "isdnl1.h" 17#include "isdnl1.h"
18 18
19extern const char *CardType[];
20
21static const char *mic_revision = "$Revision: 1.12.2.4 $"; 19static const char *mic_revision = "$Revision: 1.12.2.4 $";
22 20
23#define byteout(addr,val) outb(val,addr) 21#define byteout(addr,val) outb(val,addr)
@@ -210,8 +208,7 @@ setup_mic(struct IsdnCard *card)
210 208
211 if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) { 209 if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) {
212 printk(KERN_WARNING 210 printk(KERN_WARNING
213 "HiSax: %s config port %x-%x already in use\n", 211 "HiSax: ith mic config port %x-%x already in use\n",
214 CardType[card->typ],
215 cs->hw.mic.cfg_reg, 212 cs->hw.mic.cfg_reg,
216 cs->hw.mic.cfg_reg + bytecnt); 213 cs->hw.mic.cfg_reg + bytecnt);
217 return (0); 214 return (0);