Char: mxser_new, compress isa finding
Subsystems (2)
PATCH 5/6 Char: mxser_new, compress isa finding
mxser_new, compress isa finding
ISA cards finding was too complex -- 2 (module params + predefined) absolutely same routines, join them together with one for loop, one if and one indent level.
Cc Alan Cox <[email protected]>
Signed-off-by Jiri Slaby <[email protected]>
---
commit 27366d3720e2c8f1abad4dd24ca407544ba55cd5
tree de16e5688b36c0f307770d7ce4bc3405098acb58
parent 24213aff7a051554d9e489db5d60605e1a6ae7ab
author Jiri Slaby <[email protected]> Sat, 07 Oct 2006 00:24:59 +0200 committer Jiri Slaby <[email protected]> Sat, 07 Oct 2006 00:24:59 +0200
drivers/char/mxser_new.c | 109 +++++++++++++++++----------------------------- 1 files changed, 40 insertions(+), 69 deletions(-)
drivers/char/mxser_new.c +40 -69
@@ -2803,7 +2803,8 @@ static int __init mxser_module_init(void {struct pci_dev *pdev =NULL ;struct mxser_board *brd; -unsigned int i, m; +unsigned long cap; +unsigned int i, m, isaloop;int retval, b, n;pr_debug ("Loading module mxser ...\n" );
@@ -2839,84 +2840,54 @@ static int __init mxser_module_init(void m =0 ;/* Start finding ISA boards here */ -for (b =0 ; b <MXSER_BOARDS && m <MXSER_BOARDS ; b++) { -int cap; - -if (!(cap = mxserBoardCAP[b])) -continue ; - - brd = &mxser_boards[m]; - retval =mxser_get_ISA_conf (cap, brd); - -if (retval !=0 ) -printk (KERN_INFO "Found MOXA %s board (CAP=0x%x)\n" , - mxser_brdname[brd->board_type -1 ], ioaddr[b]); - -if (retval <=0 ) { -if (retval ==MXSER_ERR_IRQ ) -printk (KERN_ERR "Invalid interrupt number, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_IRQ_CONFLIT ) -printk (KERN_ERR "Invalid interrupt number, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_VECTOR ) -printk (KERN_ERR "Invalid interrupt vector, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_IOADDR ) -printk (KERN_ERR "Invalid I/O address, " -"board not configured\n" ); +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 */ -continue ; - } +if (!cap) +continue ; - brd->pdev =NULL ; + brd = &mxser_boards[m]; + retval =mxser_get_ISA_conf (cap, brd); -/* mxser_initbrd will hook ISR. */ -if (mxser_initbrd (brd) <0 ) -continue ; +if (retval !=0 ) +printk (KERN_INFO "Found MOXA %s board " +"(CAP=0x%x)\n" , + mxser_brdname[brd->board_type -1 ], + ioaddr[b]); - m++; - } +if (retval <=0 ) { +if (retval ==MXSER_ERR_IRQ ) +printk (KERN_ERR "Invalid interrupt " +"number, board not " +"configured\n" ); +else if (retval ==MXSER_ERR_IRQ_CONFLIT ) +printk (KERN_ERR "Invalid interrupt " +"number, board not " +"configured\n" ); +else if (retval ==MXSER_ERR_VECTOR ) +printk (KERN_ERR "Invalid interrupt " +"vector, board not " +"configured\n" ); +else if (retval ==MXSER_ERR_IOADDR ) +printk (KERN_ERR "Invalid I/O address, " +"board not configured\n" ); -/* Start finding ISA boards from module arg */ -for (b =0 ; b <MXSER_BOARDS && m <MXSER_BOARDS ; b++) { -unsigned long cap; +continue ; + } -if (!(cap = ioaddr[b])) -continue ; + brd->pdev =NULL ; - brd = &mxser_boards[m]; - retval =mxser_get_ISA_conf (cap, &mxser_boards[m]); - -if (retval !=0 ) -printk (KERN_INFO "Found MOXA %s board (CAP=0x%x)\n" , - mxser_brdname[brd->board_type -1 ], ioaddr[b]); - -if (retval <=0 ) { -if (retval ==MXSER_ERR_IRQ ) -printk (KERN_ERR "Invalid interrupt number, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_IRQ_CONFLIT ) -printk (KERN_ERR "Invalid interrupt number, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_VECTOR ) -printk (KERN_ERR "Invalid interrupt vector, " -"board not configured\n" ); -else if (retval ==MXSER_ERR_IOADDR ) -printk (KERN_ERR "Invalid I/O address, " -"board not configured\n" ); +/* mxser_initbrd will hook ISR. */ +if (mxser_initbrd (brd) <0 ) +continue ; -continue ; + m++; } - brd->pdev =NULL ; -/* mxser_initbrd will hook ISR. */ -if (mxser_initbrd (brd) <0 ) -continue ; - - m++; - } -/* start finding PCI board here */ n =ARRAY_SIZE (mxser_pcibrds) -1 ; b =0 ;