mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 19:00:25 +00:00
Code Issues Releases Wiki Activity

Char: mxser, remove predefined isa support

Browse source 
Remove a support of ISA addresses predefined at compile time.  It is
unused (filled by zeroes) and prolongs the code.  Don't initialize global
array and add `ioaddr' module param description.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
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-07-25 01:48:22 -07:00 committed by Linus Torvalds
parent 83766bc63f
commit 1df0092477
1 changed files with 29 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/char/mxser.c
View file

@ -173,14 +173,15 @@ static struct pci_device_id mxser_pcibrds[] = {
};
MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
static int ioaddr[MXSER_BOARDS] = { 0, 0, 0, 0 };
static unsigned long ioaddr[MXSER_BOARDS];
static int ttymajor = MXSERMAJOR;
/* Variables for insmod */
MODULE_AUTHOR("Casper Yang");
MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver");
module_param_array(ioaddr, int, NULL, 0);
module_param_array(ioaddr, ulong, NULL, 0);
MODULE_PARM_DESC(ioaddr, "ISA io addresses to look for a moxa board");
module_param(ttymajor, int, 0);
MODULE_LICENSE("GPL");
@ -281,11 +282,6 @@ struct mxser_mstatus {
int dcd;
};
static int mxserBoardCAP[MXSER_BOARDS] = {
0, 0, 0, 0
/* 0x180, 0x280, 0x200, 0x320 */
};
static struct mxser_board mxser_boards[MXSER_BOARDS];
static struct tty_driver *mxvar_sdriver;
static struct mxser_log mxvar_log;
@ -2763,9 +2759,8 @@ static struct pci_driver mxser_driver = {
static int __init mxser_module_init(void)
{
struct mxser_board *brd;
unsigned long cap;
unsigned int i, m, isaloop;
int retval, b;
unsigned int b, i, m;
int retval;
pr_debug("Loading module mxser ...\n");
@ -2797,42 +2792,34 @@ static int __init mxser_module_init(void)
goto err_put;
}
m = 0;
/* Start finding ISA boards here */
for (isaloop = 0; isaloop < 2; isaloop++)
for (b = 0; b < MXSER_BOARDS && m < MXSER_BOARDS; b++) {
if (!isaloop)
cap = mxserBoardCAP[b]; /* predefined */
else
cap = ioaddr[b]; /* module param */
for (m = 0, b = 0; b < MXSER_BOARDS; b++) {
if (!ioaddr[b])
continue;
if (!cap)
continue;
brd = &mxser_boards[m];
retval = mxser_get_ISA_conf(cap, brd);
if (retval <= 0) {
brd->info = NULL;
continue;
}
printk(KERN_INFO "mxser: found MOXA %s board "
"(CAP=0x%x)\n", brd->info->name, ioaddr[b]);
/* mxser_initbrd will hook ISR. */
if (mxser_initbrd(brd, NULL) < 0) {
brd->info = NULL;
continue;
}
brd->idx = m * MXSER_PORTS_PER_BOARD;
for (i = 0; i < brd->info->nports; i++)
tty_register_device(mxvar_sdriver, brd->idx + i,
NULL);
m++;
brd = &mxser_boards[m];
retval = mxser_get_ISA_conf(!ioaddr[b], brd);
if (retval <= 0) {
brd->info = NULL;
continue;
}
printk(KERN_INFO "mxser: found MOXA %s board (CAP=0x%lx)\n",
brd->info->name, ioaddr[b]);
/* mxser_initbrd will hook ISR. */
if (mxser_initbrd(brd, NULL) < 0) {
brd->info = NULL;
continue;
}
brd->idx = m * MXSER_PORTS_PER_BOARD;
for (i = 0; i < brd->info->nports; i++)
tty_register_device(mxvar_sdriver, brd->idx + i, NULL);
m++;
}
retval = pci_register_driver(&mxser_driver);
if (retval) {
printk(KERN_ERR "mxser: can't register pci driver\n");