Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Char: moxa, remove static isa support

Browse source 
Static ISA field is empty and probably will never be filled in, remove it.
The driver still supports ISA cards passed through module parameter.  This
actually fixes one bug inside the initialization of module-param passed cards
initialization.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2008-04-30 00:53:36 -07:00 committed by Linus Torvalds
parent cbacdd9572
commit 37794952a6
1 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/char/moxa.c
View file

@ -92,17 +92,6 @@ static struct pci_device_id moxa_pcibrds[] = {
MODULE_DEVICE_TABLE(pci, moxa_pcibrds);
#endif /* CONFIG_PCI */
struct moxa_isa_board_conf {
int boardType;
int numPorts;
unsigned long baseAddr;
};
static struct moxa_isa_board_conf moxa_isa_boards[] =
{
/* {MOXA_BOARD_C218_ISA,8,0xDC000}, */
};
static struct moxa_board_conf {
int boardType;
int numPorts;
@ -346,7 +335,7 @@ static struct pci_driver moxa_pci_driver = {
static int __init moxa_init(void)
{
int i, numBoards, retval = 0;
int i, numBoards = 0, retval = 0;
struct moxa_port *ch;
printk(KERN_INFO "MOXA Intellio family driver version %s\n",
@ -391,25 +380,6 @@ static int __init moxa_init(void)
mod_timer(&moxaTimer, jiffies + HZ / 50);
/* Find the boards defined in source code */
numBoards = 0;
for (i = 0; i < MAX_BOARDS; i++) {
if ((moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA) ||
(moxa_isa_boards[i].boardType == MOXA_BOARD_C320_ISA)) {
moxa_boards[numBoards].boardType = moxa_isa_boards[i].boardType;
if (moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA)
moxa_boards[numBoards].numPorts = 8;
else
moxa_boards[numBoards].numPorts = moxa_isa_boards[i].numPorts;
moxa_boards[numBoards].busType = MOXA_BUS_TYPE_ISA;
moxa_boards[numBoards].baseAddr = moxa_isa_boards[i].baseAddr;
pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
numBoards + 1,
moxa_brdname[moxa_boards[numBoards].boardType-1],
moxa_boards[numBoards].baseAddr);
numBoards++;
}
}
/* Find the boards defined form module args. */
#ifdef MODULE
for (i = 0; i < MAX_BOARDS; i++) {
@ -425,7 +395,7 @@ static int __init moxa_init(void)
continue;
}
moxa_boards[numBoards].boardType = type[i];
if (moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA)
if (type[i] == MOXA_BOARD_C218_ISA)
moxa_boards[numBoards].numPorts = 8;
else
moxa_boards[numBoards].numPorts = numports[i];