diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-31 10:42:07 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-21 02:22:31 +0400 |
| commit | 8349304d12cf1313bdbd6eb2083701d86809be24 (patch) | |
| tree | 599d43c202cda35b80966d9f364559484ca4145a /drivers/isdn/hisax/bkm_a4t.c | |
| parent | d38c8475b4f3a684ac673dcedc88ffdb17b74882 (diff) | |
| download | linux-8349304d12cf1313bdbd6eb2083701d86809be24.tar.xz | |
[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/bkm_a4t.c')
| -rw-r--r-- | drivers/isdn/hisax/bkm_a4t.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 3d1bdc8431ad..9ca2ee54cc94 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -20,8 +20,6 @@ #include <linux/pci.h> #include "bkm_ax.h" -extern const char *CardType[]; - static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $"; @@ -284,15 +282,16 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, I20_REGISTER_FILE *pI20_Regs; if (!cs->irq) { /* IRQ range check ?? */ - printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]); + printk(KERN_WARNING "HiSax: Telekom A4T: No IRQ\n"); return (0); } cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); /* Check suspecious address */ pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { - printk(KERN_WARNING "HiSax: %s address %lx-%lx suspecious\n", - CardType[card->typ], cs->hw.ax.base, cs->hw.ax.base + 4096); + printk(KERN_WARNING "HiSax: Telekom A4T address " + "%lx-%lx suspicious\n", + cs->hw.ax.base, cs->hw.ax.base + 4096); iounmap((void *) cs->hw.ax.base); cs->hw.ax.base = 0; return (0); @@ -302,8 +301,9 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, cs->hw.ax.isac_ale = GCS_1; cs->hw.ax.jade_ale = GCS_3; - printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", - CardType[card->typ], cs->hw.ax.base, cs->irq); + printk(KERN_INFO "HiSax: Telekom A4T: Card configured at " + "0x%lX IRQ %d\n", + cs->hw.ax.base, cs->irq); setup_isac(cs); cs->readisac = &ReadISAC; @@ -349,11 +349,12 @@ setup_bkm_a4t(struct IsdnCard *card) break; } if (!found) { - printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); + printk(KERN_WARNING "HiSax: Telekom A4T: Card not found\n"); return (0); } if (!pci_memaddr) { - printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); + printk(KERN_WARNING "HiSax: Telekom A4T: " + "No Memory base address\n"); return (0); } |