aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/nj_s.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/nj_s.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/nj_s.c')
-rw-r--r--drivers/isdn/hisax/nj_s.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index a895dfed40e5..8d36ccc87d81 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -235,8 +235,7 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card,
235 cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq); 235 cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq);
236 if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { 236 if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) {
237 printk(KERN_WARNING 237 printk(KERN_WARNING
238 "HiSax: %s config port %#lx-%#lx already in use\n", 238 "HiSax: NETjet-S config port %#lx-%#lx already in use\n",
239 CardType[card->typ],
240 cs->hw.njet.base, 239 cs->hw.njet.base,
241 cs->hw.njet.base + bytecnt); 240 cs->hw.njet.base + bytecnt);
242 return (0); 241 return (0);