Skip to content

Commit

Permalink
[PATCH] Char: sx, remove duplicite code
Browse files Browse the repository at this point in the history
sx_remove_code contents were used twice.  Call this function instead.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 42f6384 commit 55e7071
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions drivers/char/sx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2680,28 +2680,16 @@ static int __init sx_init(void)
static void __exit sx_exit (void)
{
int i;
struct sx_board *board;

func_enter();
#ifdef CONFIG_EISA
eisa_driver_unregister(&sx_eisadriver);
#endif
pci_unregister_driver(&sx_pcidriver);
for (i = 0; i < SX_NBOARDS; i++) {
board = &boards[i];
if (board->flags & SX_BOARD_INITIALIZED) {
sx_dprintk (SX_DEBUG_CLEANUP, "Cleaning up board at %p\n", board->base);
/* The board should stop messing with us.
(actually I mean the interrupt) */
sx_reset (board);
if ((board->irq) && (board->flags & SX_IRQ_ALLOCATED))
free_irq (board->irq, board);

/* It is safe/allowed to del_timer a non-active timer */
del_timer (& board->timer);
iounmap(board->base);
}
}
for (i = 0; i < SX_NBOARDS; i++)
sx_remove_card(&boards[i]);

if (misc_deregister(&sx_fw_device) < 0) {
printk (KERN_INFO "sx: couldn't deregister firmware loader device\n");
}
Expand Down

0 comments on commit 55e7071

Please sign in to comment.