Skip to content

L
linux
Commit abe834c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 

* 'isdn-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] Hisax: eliminate many unnecessary references to CardType[]
  [ISDN] HiSax: modularization prep
parents e16b2781 8349304d
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 125 deletions
drivers/isdn/hisax/asuscom.c
View file @ abe834c8
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *Asuscom_revision = "$Revision: 1.14.2.4 $"; static const char *Asuscom_revision = "$Revision: 1.14.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -376,8 +374,7 @@ setup_asuscom(struct IsdnCard *card) ...@@ -376,8 +374,7 @@ setup_asuscom(struct IsdnCard *card)
cs->irq = card->para[0]; cs->irq = card->para[0];
if (!request_region(cs->hw.asus.cfg_reg, bytecnt, "asuscom isdn")) { if (!request_region(cs->hw.asus.cfg_reg, bytecnt, "asuscom isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: ISDNLink config port %x-%x already in use\n",
CardType[card->typ],
cs->hw.asus.cfg_reg, cs->hw.asus.cfg_reg,
cs->hw.asus.cfg_reg + bytecnt); cs->hw.asus.cfg_reg + bytecnt);
return (0); return (0);
......
drivers/isdn/hisax/avm_a1.c
View file @ abe834c8
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *avm_revision = "$Revision: 2.15.2.4 $"; static const char *avm_revision = "$Revision: 2.15.2.4 $";
#define AVM_A1_STAT_ISAC 0x01 #define AVM_A1_STAT_ISAC 0x01
...@@ -200,16 +199,14 @@ setup_avm_a1(struct IsdnCard *card) ...@@ -200,16 +199,14 @@ setup_avm_a1(struct IsdnCard *card)
cs->irq = card->para[0]; cs->irq = card->para[0];
if (!request_region(cs->hw.avm.cfg_reg, 8, "avm cfg")) { if (!request_region(cs->hw.avm.cfg_reg, 8, "avm cfg")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: AVM A1 config port %x-%x already in use\n",
CardType[card->typ],
cs->hw.avm.cfg_reg, cs->hw.avm.cfg_reg,
cs->hw.avm.cfg_reg + 8); cs->hw.avm.cfg_reg + 8);
return (0); return (0);
} }
if (!request_region(cs->hw.avm.isac + 32, 32, "HiSax isac")) { if (!request_region(cs->hw.avm.isac + 32, 32, "HiSax isac")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s isac ports %x-%x already in use\n", "HiSax: AVM A1 isac ports %x-%x already in use\n",
CardType[cs->typ],
cs->hw.avm.isac + 32, cs->hw.avm.isac + 32,
cs->hw.avm.isac + 64); cs->hw.avm.isac + 64);
release_ioregs(cs, 0); release_ioregs(cs, 0);
...@@ -217,16 +214,14 @@ setup_avm_a1(struct IsdnCard *card) ...@@ -217,16 +214,14 @@ setup_avm_a1(struct IsdnCard *card)
} }
if (!request_region(cs->hw.avm.isacfifo, 1, "HiSax isac fifo")) { if (!request_region(cs->hw.avm.isacfifo, 1, "HiSax isac fifo")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s isac fifo port %x already in use\n", "HiSax: AVM A1 isac fifo port %x already in use\n",
CardType[cs->typ],
cs->hw.avm.isacfifo); cs->hw.avm.isacfifo);
release_ioregs(cs, 1); release_ioregs(cs, 1);
return (0); return (0);
} }
if (!request_region(cs->hw.avm.hscx[0] + 32, 32, "HiSax hscx A")) { if (!request_region(cs->hw.avm.hscx[0] + 32, 32, "HiSax hscx A")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s hscx A ports %x-%x already in use\n", "HiSax: AVM A1 hscx A ports %x-%x already in use\n",
CardType[cs->typ],
cs->hw.avm.hscx[0] + 32, cs->hw.avm.hscx[0] + 32,
cs->hw.avm.hscx[0] + 64); cs->hw.avm.hscx[0] + 64);
release_ioregs(cs, 3); release_ioregs(cs, 3);
...@@ -234,16 +229,14 @@ setup_avm_a1(struct IsdnCard *card) ...@@ -234,16 +229,14 @@ setup_avm_a1(struct IsdnCard *card)
} }
if (!request_region(cs->hw.avm.hscxfifo[0], 1, "HiSax hscx A fifo")) { if (!request_region(cs->hw.avm.hscxfifo[0], 1, "HiSax hscx A fifo")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s hscx A fifo port %x already in use\n", "HiSax: AVM A1 hscx A fifo port %x already in use\n",
CardType[cs->typ],
cs->hw.avm.hscxfifo[0]); cs->hw.avm.hscxfifo[0]);
release_ioregs(cs, 7); release_ioregs(cs, 7);
return (0); return (0);
} }
if (!request_region(cs->hw.avm.hscx[1] + 32, 32, "HiSax hscx B")) { if (!request_region(cs->hw.avm.hscx[1] + 32, 32, "HiSax hscx B")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s hscx B ports %x-%x already in use\n", "HiSax: AVM A1 hscx B ports %x-%x already in use\n",
CardType[cs->typ],
cs->hw.avm.hscx[1] + 32, cs->hw.avm.hscx[1] + 32,
cs->hw.avm.hscx[1] + 64); cs->hw.avm.hscx[1] + 64);
release_ioregs(cs, 0xf); release_ioregs(cs, 0xf);
...@@ -251,8 +244,7 @@ setup_avm_a1(struct IsdnCard *card) ...@@ -251,8 +244,7 @@ setup_avm_a1(struct IsdnCard *card)
} }
if (!request_region(cs->hw.avm.hscxfifo[1], 1, "HiSax hscx B fifo")) { if (!request_region(cs->hw.avm.hscxfifo[1], 1, "HiSax hscx B fifo")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s hscx B fifo port %x already in use\n", "HiSax: AVM A1 hscx B fifo port %x already in use\n",
CardType[cs->typ],
cs->hw.avm.hscxfifo[1]); cs->hw.avm.hscxfifo[1]);
release_ioregs(cs, 0x1f); release_ioregs(cs, 0x1f);
return (0); return (0);
...@@ -284,9 +276,8 @@ setup_avm_a1(struct IsdnCard *card) ...@@ -284,9 +276,8 @@ setup_avm_a1(struct IsdnCard *card)
printk(KERN_INFO "AVM A1: Byte at %x is %x\n", printk(KERN_INFO "AVM A1: Byte at %x is %x\n",
cs->hw.avm.cfg_reg, val); cs->hw.avm.cfg_reg, val);
printk(KERN_INFO printk(KERN_INFO "HiSax: AVM A1 config irq:%d cfg:0x%X\n",
"HiSax: %s config irq:%d cfg:0x%X\n", cs->irq,
CardType[cs->typ], cs->irq,
cs->hw.avm.cfg_reg); cs->hw.avm.cfg_reg);
printk(KERN_INFO printk(KERN_INFO
"HiSax: isac:0x%X/0x%X\n", "HiSax: isac:0x%X/0x%X\n",
......
drivers/isdn/hisax/bkm_a4t.c
View file @ abe834c8
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include "bkm_ax.h" #include "bkm_ax.h"
extern const char *CardType[];
static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $"; static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $";
...@@ -284,15 +282,16 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, ...@@ -284,15 +282,16 @@ static int __devinit a4t_cs_init(struct IsdnCard *card,
I20_REGISTER_FILE *pI20_Regs; I20_REGISTER_FILE *pI20_Regs;
if (!cs->irq) { /* IRQ range check ?? */ 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); return (0);
} }
cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096);
/* Check suspecious address */ /* Check suspecious address */
pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base);
if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) {
printk(KERN_WARNING "HiSax: %s address %lx-%lx suspecious\n", printk(KERN_WARNING "HiSax: Telekom A4T address "
CardType[card->typ], cs->hw.ax.base, cs->hw.ax.base + 4096); "%lx-%lx suspicious\n",
cs->hw.ax.base, cs->hw.ax.base + 4096);
iounmap((void *) cs->hw.ax.base); iounmap((void *) cs->hw.ax.base);
cs->hw.ax.base = 0; cs->hw.ax.base = 0;
return (0); return (0);
...@@ -302,8 +301,9 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, ...@@ -302,8 +301,9 @@ static int __devinit a4t_cs_init(struct IsdnCard *card,
cs->hw.ax.isac_ale = GCS_1; cs->hw.ax.isac_ale = GCS_1;
cs->hw.ax.jade_ale = GCS_3; cs->hw.ax.jade_ale = GCS_3;
printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", printk(KERN_INFO "HiSax: Telekom A4T: Card configured at "
CardType[card->typ], cs->hw.ax.base, cs->irq); "0x%lX IRQ %d\n",
cs->hw.ax.base, cs->irq);
setup_isac(cs); setup_isac(cs);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
...@@ -349,11 +349,12 @@ setup_bkm_a4t(struct IsdnCard *card) ...@@ -349,11 +349,12 @@ setup_bkm_a4t(struct IsdnCard *card)
break; break;
} }
if (!found) { 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); return (0);
} }
if (!pci_memaddr) { 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); return (0);
} }
......
drivers/isdn/hisax/bkm_a8.c
View file @ abe834c8
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */ #define ATTEMPT_PCI_REMAPPING /* Required for PLX rev 1 */
extern const char *CardType[];
static const char sct_quadro_revision[] = "$Revision: 1.22.2.4 $"; static const char sct_quadro_revision[] = "$Revision: 1.22.2.4 $";
static const char *sct_quadro_subtypes[] = static const char *sct_quadro_subtypes[] =
...@@ -181,8 +179,7 @@ bkm_interrupt_ipac(int intno, void *dev_id) ...@@ -181,8 +179,7 @@ bkm_interrupt_ipac(int intno, void *dev_id)
goto Start_IPAC; goto Start_IPAC;
} }
if (!icnt) if (!icnt)
printk(KERN_WARNING "HiSax: %s (%s) IRQ LOOP\n", printk(KERN_WARNING "HiSax: Scitel Quadro (%s) IRQ LOOP\n",
CardType[cs->typ],
sct_quadro_subtypes[cs->subtyp]); sct_quadro_subtypes[cs->subtyp]);
writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xFF); writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xFF);
writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xC0); writereg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_MASK, 0xC0);
...@@ -296,8 +293,8 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -296,8 +293,8 @@ setup_sct_quadro(struct IsdnCard *card)
if (card->para[0] >= SCT_1 && card->para[0] <= SCT_4) if (card->para[0] >= SCT_1 && card->para[0] <= SCT_4)
cs->subtyp = card->para[0]; cs->subtyp = card->para[0];
else { else {
printk(KERN_WARNING "HiSax: %s: Invalid subcontroller in configuration, default to 1\n", printk(KERN_WARNING "HiSax: Scitel Quadro: Invalid "
CardType[card->typ]); "subcontroller in configuration, default to 1\n");
return (0); return (0);
} }
if ((cs->subtyp != SCT_1) && ((sub_sys_id != PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO) || if ((cs->subtyp != SCT_1) && ((sub_sys_id != PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO) ||
...@@ -322,16 +319,16 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -322,16 +319,16 @@ setup_sct_quadro(struct IsdnCard *card)
} }
} }
if (!found) { if (!found) {
printk(KERN_WARNING "HiSax: %s (%s): Card not found\n", printk(KERN_WARNING "HiSax: Scitel Quadro (%s): "
CardType[card->typ], "Card not found\n",
sct_quadro_subtypes[cs->subtyp]); sct_quadro_subtypes[cs->subtyp]);
return (0); return (0);
} }
#ifdef ATTEMPT_PCI_REMAPPING #ifdef ATTEMPT_PCI_REMAPPING
/* HACK: PLX revision 1 bug: PLX address bit 7 must not be set */ /* HACK: PLX revision 1 bug: PLX address bit 7 must not be set */
if ((pci_ioaddr1 & 0x80) && (dev_a8->revision == 1)) { if ((pci_ioaddr1 & 0x80) && (dev_a8->revision == 1)) {
printk(KERN_WARNING "HiSax: %s (%s): PLX rev 1, remapping required!\n", printk(KERN_WARNING "HiSax: Scitel Quadro (%s): "
CardType[card->typ], "PLX rev 1, remapping required!\n",
sct_quadro_subtypes[cs->subtyp]); sct_quadro_subtypes[cs->subtyp]);
/* Restart PCI negotiation */ /* Restart PCI negotiation */
pci_write_config_dword(dev_a8, PCI_BASE_ADDRESS_1, (u_int) - 1); pci_write_config_dword(dev_a8, PCI_BASE_ADDRESS_1, (u_int) - 1);
...@@ -344,8 +341,7 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -344,8 +341,7 @@ setup_sct_quadro(struct IsdnCard *card)
#endif /* End HACK */ #endif /* End HACK */
} }
if (!pci_irq) { /* IRQ range check ?? */ if (!pci_irq) { /* IRQ range check ?? */
printk(KERN_WARNING "HiSax: %s (%s): No IRQ\n", printk(KERN_WARNING "HiSax: Scitel Quadro (%s): No IRQ\n",
CardType[card->typ],
sct_quadro_subtypes[cs->subtyp]); sct_quadro_subtypes[cs->subtyp]);
return (0); return (0);
} }
...@@ -355,8 +351,8 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -355,8 +351,8 @@ setup_sct_quadro(struct IsdnCard *card)
pci_read_config_dword(dev_a8, PCI_BASE_ADDRESS_4, &pci_ioaddr4); pci_read_config_dword(dev_a8, PCI_BASE_ADDRESS_4, &pci_ioaddr4);
pci_read_config_dword(dev_a8, PCI_BASE_ADDRESS_5, &pci_ioaddr5); pci_read_config_dword(dev_a8, PCI_BASE_ADDRESS_5, &pci_ioaddr5);
if (!pci_ioaddr1 || !pci_ioaddr2 || !pci_ioaddr3 || !pci_ioaddr4 || !pci_ioaddr5) { if (!pci_ioaddr1 || !pci_ioaddr2 || !pci_ioaddr3 || !pci_ioaddr4 || !pci_ioaddr5) {
printk(KERN_WARNING "HiSax: %s (%s): No IO base address(es)\n", printk(KERN_WARNING "HiSax: Scitel Quadro (%s): "
CardType[card->typ], "No IO base address(es)\n",
sct_quadro_subtypes[cs->subtyp]); sct_quadro_subtypes[cs->subtyp]);
return (0); return (0);
} }
...@@ -411,8 +407,8 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -411,8 +407,8 @@ setup_sct_quadro(struct IsdnCard *card)
/* For isac and hscx data path */ /* For isac and hscx data path */
cs->hw.ax.data_adr = cs->hw.ax.base + 4; cs->hw.ax.data_adr = cs->hw.ax.base + 4;
printk(KERN_INFO "HiSax: %s (%s) configured at 0x%.4lX, 0x%.4lX, 0x%.4lX and IRQ %d\n", printk(KERN_INFO "HiSax: Scitel Quadro (%s) configured at "
CardType[card->typ], "0x%.4lX, 0x%.4lX, 0x%.4lX and IRQ %d\n",
sct_quadro_subtypes[cs->subtyp], sct_quadro_subtypes[cs->subtyp],
cs->hw.ax.plx_adr, cs->hw.ax.plx_adr,
cs->hw.ax.base, cs->hw.ax.base,
...@@ -432,8 +428,7 @@ setup_sct_quadro(struct IsdnCard *card) ...@@ -432,8 +428,7 @@ setup_sct_quadro(struct IsdnCard *card)
cs->cardmsg = &BKM_card_msg; cs->cardmsg = &BKM_card_msg;
cs->irq_func = &bkm_interrupt_ipac; cs->irq_func = &bkm_interrupt_ipac;
printk(KERN_INFO "HiSax: %s (%s): IPAC Version %d\n", printk(KERN_INFO "HiSax: Scitel Quadro (%s): IPAC Version %d\n",
CardType[card->typ],
sct_quadro_subtypes[cs->subtyp], sct_quadro_subtypes[cs->subtyp],
readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID)); readreg(cs->hw.ax.base, cs->hw.ax.data_adr, IPAC_ID));
return (1); return (1);
......
drivers/isdn/hisax/config.c
View file @ abe834c8
...@@ -1169,7 +1169,9 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card, ...@@ -1169,7 +1169,9 @@ static int hisax_cs_setup(int cardnr, struct IsdnCard *card,
/* Used from an exported function but calls __devinit functions. /* Used from an exported function but calls __devinit functions.
* Tell modpost not to warn (__ref) * Tell modpost not to warn (__ref)
*/ */
static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) static int __ref checkcard(int cardnr, char *id, int *busy_flag,
struct module *lockowner,
hisax_setup_func_t card_setup)
{ {
int ret; int ret;
struct IsdnCard *card = cards + cardnr; struct IsdnCard *card = cards + cardnr;
...@@ -1187,7 +1189,7 @@ static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module * ...@@ -1187,7 +1189,7 @@ static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module *
(card->protocol == ISDN_PTYPE_NI1) ? "NI1" : (card->protocol == ISDN_PTYPE_NI1) ? "NI1" :
"NONE", cs->iif.id, cs->myid); "NONE", cs->iif.id, cs->myid);
ret = hisax_cs_setup_card(card); ret = card_setup(card);
if (!ret) { if (!ret) {
ll_unload(cs); ll_unload(cs);
goto outf_cs; goto outf_cs;
...@@ -1241,7 +1243,8 @@ static int HiSax_inithardware(int *busy_flag) ...@@ -1241,7 +1243,8 @@ static int HiSax_inithardware(int *busy_flag)
else else
sprintf(ids, "%s%d", id, i); sprintf(ids, "%s%d", id, i);
} }
if (checkcard(i, ids, busy_flag, THIS_MODULE)) { if (checkcard(i, ids, busy_flag, THIS_MODULE,
hisax_cs_setup_card)) {
foundcards++; foundcards++;
i++; i++;
} else { } else {
...@@ -1549,7 +1552,8 @@ int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) ...@@ -1549,7 +1552,8 @@ int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
sprintf(ids, "HiSax%d", nrcards); sprintf(ids, "HiSax%d", nrcards);
else else
sprintf(ids, "HiSax"); sprintf(ids, "HiSax");
if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE)) if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE,
hisax_cs_setup_card))
goto error; goto error;
ret = nrcards; ret = nrcards;
...@@ -1595,7 +1599,7 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], ...@@ -1595,7 +1599,7 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
cards[i].protocol = protocol; cards[i].protocol = protocol;
sprintf(id, "%s%d", name, i); sprintf(id, "%s%d", name, i);
nrcards++; nrcards++;
retval = checkcard(i, id, NULL, hisax_d_if->owner); retval = checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card);
if (retval == 0) { // yuck if (retval == 0) { // yuck
cards[i].typ = 0; cards[i].typ = 0;
nrcards--; nrcards--;
......
drivers/isdn/hisax/gazel.c
View file @ abe834c8
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "ipac.h" #include "ipac.h"
#include <linux/pci.h> #include <linux/pci.h>
extern const char *CardType[];
static const char *gazel_revision = "$Revision: 2.19.2.4 $"; static const char *gazel_revision = "$Revision: 2.19.2.4 $";
#define R647 1 #define R647 1
...@@ -479,8 +478,8 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs) ...@@ -479,8 +478,8 @@ reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs)
return 0; return 0;
error: error:
printk(KERN_WARNING "Gazel: %s io ports 0x%x-0x%x already in use\n", printk(KERN_WARNING "Gazel: io ports 0x%x-0x%x already in use\n",
CardType[cs->typ], adr, adr + len); adr, adr + len);
return 1; return 1;
} }
......
drivers/isdn/hisax/hfc_pci.c
View file @ abe834c8
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
extern const char *CardType[];
static const char *hfcpci_revision = "$Revision: 1.48.2.4 $"; static const char *hfcpci_revision = "$Revision: 1.48.2.4 $";
/* table entry in the PCI devices list */ /* table entry in the PCI devices list */
......
drivers/isdn/hisax/hfc_sx.c
View file @ abe834c8
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/isapnp.h> #include <linux/isapnp.h>
extern const char *CardType[];
static const char *hfcsx_revision = "$Revision: 1.12.2.5 $"; static const char *hfcsx_revision = "$Revision: 1.12.2.5 $";
/***************************************/ /***************************************/
......
drivers/isdn/hisax/hisax_cfg.h
View file @ abe834c8
...@@ -60,5 +60,7 @@ struct IsdnCard { ...@@ -60,5 +60,7 @@ struct IsdnCard {
IsdnCardState_t *cs; IsdnCardState_t *cs;
}; };
typedef int (*hisax_setup_func_t)(struct IsdnCard *card);
extern void HiSax_closecard(int); extern void HiSax_closecard(int);
extern int hisax_init_pcmcia(void *, int *, IsdnCard_t *); extern int hisax_init_pcmcia(void *, int *, IsdnCard_t *);
drivers/isdn/hisax/isurf.c
View file @ abe834c8
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include "isdnl1.h" #include "isdnl1.h"
#include <linux/isapnp.h> #include <linux/isapnp.h>
extern const char *CardType[];
static const char *ISurf_revision = "$Revision: 1.12.2.4 $"; static const char *ISurf_revision = "$Revision: 1.12.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -251,22 +249,19 @@ setup_isurf(struct IsdnCard *card) ...@@ -251,22 +249,19 @@ setup_isurf(struct IsdnCard *card)
return(0); return(0);
} }
#else #else
printk(KERN_WARNING "HiSax: %s port/mem not set\n", printk(KERN_WARNING "HiSax: Siemens I-Surf port/mem not set\n");
CardType[card->typ]);
return (0); return (0);
#endif #endif
} }
if (!request_region(cs->hw.isurf.reset, 1, "isurf isdn")) { if (!request_region(cs->hw.isurf.reset, 1, "isurf isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x already in use\n", "HiSax: Siemens I-Surf config port %x already in use\n",
CardType[card->typ],
cs->hw.isurf.reset); cs->hw.isurf.reset);
return (0); return (0);
} }
if (!request_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE, "isurf iomem")) { if (!request_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE, "isurf iomem")) {
printk(KERN_WARNING printk(KERN_WARNING "HiSax: Siemens I-Surf memory region "
"HiSax: %s memory region %lx-%lx already in use\n", "%lx-%lx already in use\n",
CardType[card->typ],
cs->hw.isurf.phymem, cs->hw.isurf.phymem,
cs->hw.isurf.phymem + ISURF_IOMEM_SIZE); cs->hw.isurf.phymem + ISURF_IOMEM_SIZE);
release_region(cs->hw.isurf.reset, 1); release_region(cs->hw.isurf.reset, 1);
......
drivers/isdn/hisax/ix1_micro.c
View file @ abe834c8
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *ix1_revision = "$Revision: 2.12.2.4 $"; static const char *ix1_revision = "$Revision: 2.12.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -288,15 +287,15 @@ setup_ix1micro(struct IsdnCard *card) ...@@ -288,15 +287,15 @@ setup_ix1micro(struct IsdnCard *card)
if (cs->hw.ix1.cfg_reg) { if (cs->hw.ix1.cfg_reg) {
if (!request_region(cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) { if (!request_region(cs->hw.ix1.cfg_reg, 4, "ix1micro cfg")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: ITK ix1-micro Rev.2 config port "
CardType[card->typ], "%x-%x already in use\n",
cs->hw.ix1.cfg_reg, cs->hw.ix1.cfg_reg,
cs->hw.ix1.cfg_reg + 4); cs->hw.ix1.cfg_reg + 4);
return (0); return (0);
} }
} }
printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n", printk(KERN_INFO "HiSax: ITK ix1-micro Rev.2 config irq:%d io:0x%X\n",
CardType[cs->typ], cs->irq, cs->hw.ix1.cfg_reg); cs->irq, cs->hw.ix1.cfg_reg);
setup_isac(cs); setup_isac(cs);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
cs->writeisac = &WriteISAC; cs->writeisac = &WriteISAC;
......
drivers/isdn/hisax/mic.c
View file @ abe834c8
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *mic_revision = "$Revision: 1.12.2.4 $"; static const char *mic_revision = "$Revision: 1.12.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -210,8 +208,7 @@ setup_mic(struct IsdnCard *card) ...@@ -210,8 +208,7 @@ setup_mic(struct IsdnCard *card)
if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) { if (!request_region(cs->hw.mic.cfg_reg, bytecnt, "mic isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: ith mic config port %x-%x already in use\n",
CardType[card->typ],
cs->hw.mic.cfg_reg, cs->hw.mic.cfg_reg,
cs->hw.mic.cfg_reg + bytecnt); cs->hw.mic.cfg_reg + bytecnt);
return (0); return (0);
......
drivers/isdn/hisax/netjet.h
View file @ abe834c8
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
* *
*/ */
extern const char *CardType[];
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr) #define bytein(addr) inb(addr)
......
drivers/isdn/hisax/niccy.c
View file @ abe834c8
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/isapnp.h> #include <linux/isapnp.h>
extern const char *CardType[];
static const char *niccy_revision = "$Revision: 1.21.2.4 $"; static const char *niccy_revision = "$Revision: 1.21.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -284,14 +283,14 @@ int __devinit setup_niccy(struct IsdnCard *card) ...@@ -284,14 +283,14 @@ int __devinit setup_niccy(struct IsdnCard *card)
cs->subtyp = NICCY_PNP; cs->subtyp = NICCY_PNP;
cs->irq = card->para[0]; cs->irq = card->para[0];
if (!request_region(cs->hw.niccy.isac, 2, "niccy data")) { if (!request_region(cs->hw.niccy.isac, 2, "niccy data")) {
printk(KERN_WARNING "HiSax: %s data port %x-%x " printk(KERN_WARNING "HiSax: NICCY data port %x-%x "
"already in use\n", CardType[card->typ], "already in use\n",
cs->hw.niccy.isac, cs->hw.niccy.isac + 1); cs->hw.niccy.isac, cs->hw.niccy.isac + 1);
return 0; return 0;
} }
if (!request_region(cs->hw.niccy.isac_ale, 2, "niccy addr")) { if (!request_region(cs->hw.niccy.isac_ale, 2, "niccy addr")) {
printk(KERN_WARNING "HiSax: %s address port %x-%x " printk(KERN_WARNING "HiSax: NICCY address port %x-%x "
"already in use\n", CardType[card->typ], "already in use\n",
cs->hw.niccy.isac_ale, cs->hw.niccy.isac_ale,
cs->hw.niccy.isac_ale + 1); cs->hw.niccy.isac_ale + 1);
release_region(cs->hw.niccy.isac, 2); release_region(cs->hw.niccy.isac, 2);
...@@ -339,15 +338,13 @@ int __devinit setup_niccy(struct IsdnCard *card) ...@@ -339,15 +338,13 @@ int __devinit setup_niccy(struct IsdnCard *card)
cs->hw.niccy.hscx_ale = pci_ioaddr + HSCX_PCI_ADDR; cs->hw.niccy.hscx_ale = pci_ioaddr + HSCX_PCI_ADDR;
if (!request_region(cs->hw.niccy.isac, 4, "niccy")) { if (!request_region(cs->hw.niccy.isac, 4, "niccy")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s data port %x-%x already in use\n", "HiSax: NICCY data port %x-%x already in use\n",
CardType[card->typ],
cs->hw.niccy.isac, cs->hw.niccy.isac + 4); cs->hw.niccy.isac, cs->hw.niccy.isac + 4);
return 0; return 0;
} }
if (!request_region(cs->hw.niccy.cfg_reg, 0x40, "niccy pci")) { if (!request_region(cs->hw.niccy.cfg_reg, 0x40, "niccy pci")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s pci port %x-%x already in use\n", "HiSax: NICCY pci port %x-%x already in use\n",
CardType[card->typ],
cs->hw.niccy.cfg_reg, cs->hw.niccy.cfg_reg,
cs->hw.niccy.cfg_reg + 0x40); cs->hw.niccy.cfg_reg + 0x40);
release_region(cs->hw.niccy.isac, 4); release_region(cs->hw.niccy.isac, 4);
...@@ -359,8 +356,8 @@ int __devinit setup_niccy(struct IsdnCard *card) ...@@ -359,8 +356,8 @@ int __devinit setup_niccy(struct IsdnCard *card)
return 0; return 0;
#endif /* CONFIG_PCI_LEGACY */ #endif /* CONFIG_PCI_LEGACY */
} }
printk(KERN_INFO "HiSax: %s %s config irq:%d data:0x%X ale:0x%X\n", printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n",
CardType[cs->typ], (cs->subtyp == 1) ? "PnP" : "PCI", (cs->subtyp == 1) ? "PnP" : "PCI",
cs->irq, cs->hw.niccy.isac, cs->hw.niccy.isac_ale); cs->irq, cs->hw.niccy.isac, cs->hw.niccy.isac_ale);
setup_isac(cs); setup_isac(cs);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
......
drivers/isdn/hisax/nj_s.c
View file @ abe834c8
...@@ -235,8 +235,7 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card, ...@@ -235,8 +235,7 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card,
cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq); cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq);
if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %#lx-%#lx already in use\n", "HiSax: NETjet-S config port %#lx-%#lx already in use\n",
CardType[card->typ],
cs->hw.njet.base, cs->hw.njet.base,
cs->hw.njet.base + bytecnt); cs->hw.njet.base + bytecnt);
return (0); return (0);
......
drivers/isdn/hisax/nj_u.c
View file @ abe834c8
...@@ -197,8 +197,8 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, ...@@ -197,8 +197,8 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card,
cs->hw.njet.base, cs->irq); cs->hw.njet.base, cs->irq);
if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) { if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %#lx-%#lx already in use\n", "HiSax: NETspider-U config port %#lx-%#lx "
CardType[card->typ], "already in use\n",
cs->hw.njet.base, cs->hw.njet.base,
cs->hw.njet.base + bytecnt); cs->hw.njet.base + bytecnt);
return (0); return (0);
......
drivers/isdn/hisax/s0box.c
View file @ abe834c8
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *s0box_revision = "$Revision: 2.6.2.4 $"; static const char *s0box_revision = "$Revision: 2.6.2.4 $";
static inline void static inline void
...@@ -231,19 +230,15 @@ setup_s0box(struct IsdnCard *card) ...@@ -231,19 +230,15 @@ setup_s0box(struct IsdnCard *card)
cs->hw.teles3.hscxfifo[1] = cs->hw.teles3.hscx[1] + 0x3e; cs->hw.teles3.hscxfifo[1] = cs->hw.teles3.hscx[1] + 0x3e;
cs->irq = card->para[0]; cs->irq = card->para[0];
if (!request_region(cs->hw.teles3.cfg_reg,8, "S0Box parallel I/O")) { if (!request_region(cs->hw.teles3.cfg_reg,8, "S0Box parallel I/O")) {
printk(KERN_WARNING printk(KERN_WARNING "HiSax: S0Box ports %x-%x already in use\n",
"HiSax: %s ports %x-%x already in use\n",
CardType[cs->typ],
cs->hw.teles3.cfg_reg, cs->hw.teles3.cfg_reg,
cs->hw.teles3.cfg_reg + 7); cs->hw.teles3.cfg_reg + 7);
return 0; return 0;
} }
printk(KERN_INFO printk(KERN_INFO "HiSax: S0Box config irq:%d isac:0x%x cfg:0x%x\n",
"HiSax: %s config irq:%d isac:0x%x cfg:0x%x\n", cs->irq,
CardType[cs->typ], cs->irq,
cs->hw.teles3.isac, cs->hw.teles3.cfg_reg); cs->hw.teles3.isac, cs->hw.teles3.cfg_reg);
printk(KERN_INFO printk(KERN_INFO "HiSax: hscx A:0x%x hscx B:0x%x\n",
"HiSax: hscx A:0x%x hscx B:0x%x\n",
cs->hw.teles3.hscx[0], cs->hw.teles3.hscx[1]); cs->hw.teles3.hscx[0], cs->hw.teles3.hscx[1]);
setup_isac(cs); setup_isac(cs);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
......
drivers/isdn/hisax/saphir.c
View file @ abe834c8
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static char *saphir_rev = "$Revision: 1.10.2.4 $"; static char *saphir_rev = "$Revision: 1.10.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -260,15 +259,14 @@ setup_saphir(struct IsdnCard *card) ...@@ -260,15 +259,14 @@ setup_saphir(struct IsdnCard *card)
cs->irq = card->para[0]; cs->irq = card->para[0];
if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) { if (!request_region(cs->hw.saphir.cfg_reg, 6, "saphir")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: HST Saphir config port %x-%x already in use\n",
CardType[card->typ],
cs->hw.saphir.cfg_reg, cs->hw.saphir.cfg_reg,
cs->hw.saphir.cfg_reg + 5); cs->hw.saphir.cfg_reg + 5);
return (0); return (0);
} }
printk(KERN_INFO "HiSax: %s config irq:%d io:0x%X\n", printk(KERN_INFO "HiSax: HST Saphir config irq:%d io:0x%X\n",
CardType[cs->typ], cs->irq, cs->hw.saphir.cfg_reg); cs->irq, cs->hw.saphir.cfg_reg);
setup_isac(cs); setup_isac(cs);
cs->hw.saphir.timer.function = (void *) SaphirWatchDog; cs->hw.saphir.timer.function = (void *) SaphirWatchDog;
......
drivers/isdn/hisax/sportster.c
View file @ abe834c8
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "hscx.h" #include "hscx.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *sportster_revision = "$Revision: 1.16.2.4 $"; static const char *sportster_revision = "$Revision: 1.16.2.4 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -192,9 +191,9 @@ get_io_range(struct IsdnCardState *cs) ...@@ -192,9 +191,9 @@ get_io_range(struct IsdnCardState *cs)
for (i=0;i<64;i++) { for (i=0;i<64;i++) {
adr = cs->hw.spt.cfg_reg + i *1024; adr = cs->hw.spt.cfg_reg + i *1024;
if (!request_region(adr, 8, "sportster")) { if (!request_region(adr, 8, "sportster")) {
printk(KERN_WARNING printk(KERN_WARNING "HiSax: USR Sportster config port "
"HiSax: %s config port %x-%x already in use\n", "%x-%x already in use\n",
CardType[cs->typ], adr, adr + 8); adr, adr + 8);
break; break;
} }
} }
...@@ -247,8 +246,8 @@ setup_sportster(struct IsdnCard *card) ...@@ -247,8 +246,8 @@ setup_sportster(struct IsdnCard *card)
printk(KERN_WARNING "Sportster: wrong IRQ\n"); printk(KERN_WARNING "Sportster: wrong IRQ\n");
return(0); return(0);
} }
printk(KERN_INFO "HiSax: %s config irq:%d cfg:0x%X\n", printk(KERN_INFO "HiSax: USR Sportster config irq:%d cfg:0x%X\n",
CardType[cs->typ], cs->irq, cs->hw.spt.cfg_reg); cs->irq, cs->hw.spt.cfg_reg);
setup_isac(cs); setup_isac(cs);
cs->readisac = &ReadISAC; cs->readisac = &ReadISAC;
cs->writeisac = &WriteISAC; cs->writeisac = &WriteISAC;
......
drivers/isdn/hisax/teleint.c
View file @ abe834c8
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "hfc_2bs0.h" #include "hfc_2bs0.h"
#include "isdnl1.h" #include "isdnl1.h"
extern const char *CardType[];
static const char *TeleInt_revision = "$Revision: 1.16.2.5 $"; static const char *TeleInt_revision = "$Revision: 1.16.2.5 $";
#define byteout(addr,val) outb(val,addr) #define byteout(addr,val) outb(val,addr)
...@@ -286,8 +284,7 @@ setup_TeleInt(struct IsdnCard *card) ...@@ -286,8 +284,7 @@ setup_TeleInt(struct IsdnCard *card)
init_timer(&cs->hw.hfc.timer); init_timer(&cs->hw.hfc.timer);
if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) { if (!request_region(cs->hw.hfc.addr, 2, "TeleInt isdn")) {
printk(KERN_WARNING printk(KERN_WARNING
"HiSax: %s config port %x-%x already in use\n", "HiSax: TeleInt config port %x-%x already in use\n",
CardType[card->typ],
cs->hw.hfc.addr, cs->hw.hfc.addr,
cs->hw.hfc.addr + 2); cs->hw.hfc.addr + 2);
return (0); return (0);
......
drivers/isdn/hisax/telespci.c
View file @ abe834c8
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "isdnl1.h" #include "isdnl1.h"
#include <linux/pci.h> #include <linux/pci.h>
extern const char *CardType[];
static const char *telespci_revision = "$Revision: 2.23.2.3 $"; static const char *telespci_revision = "$Revision: 2.23.2.3 $";
#define ZORAN_PO_RQ_PEN 0x02000000 #define ZORAN_PO_RQ_PEN 0x02000000
...@@ -329,8 +328,8 @@ setup_telespci(struct IsdnCard *card) ...@@ -329,8 +328,8 @@ setup_telespci(struct IsdnCard *card)
/* writel(0x00800000, cs->hw.teles0.membase + 0x200); */ /* writel(0x00800000, cs->hw.teles0.membase + 0x200); */
printk(KERN_INFO printk(KERN_INFO
"HiSax: %s config irq:%d mem:%p\n", "HiSax: Teles PCI config irq:%d mem:%p\n",
CardType[cs->typ], cs->irq, cs->irq,
cs->hw.teles0.membase); cs->hw.teles0.membase);
setup_isac(cs); setup_isac(cs);
......
drivers/isdn/hisax/w6692.c
View file @ abe834c8
...@@ -38,8 +38,6 @@ static const PCI_ENTRY id_list[] = ...@@ -38,8 +38,6 @@ static const PCI_ENTRY id_list[] =
#define W6692_DYNALINK 1 #define W6692_DYNALINK 1
#define W6692_USR 2 #define W6692_USR 2
extern const char *CardType[];
static const char *w6692_revision = "$Revision: 1.18.2.4 $"; static const char *w6692_revision = "$Revision: 1.18.2.4 $";
#define DBUSY_TIMER_VALUE 80 #define DBUSY_TIMER_VALUE 80
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7