From: Jiri Slaby Date: Fri, 18 Jun 2021 06:14:17 +0000 (+0200) Subject: mxser: remove nonsense from ISR X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cef222cbffccab4ac137b2d4d232103ac9ed8a89;p=linux.git mxser: remove nonsense from ISR request_irq was passed a board. There is no need to check dev_id and/or find the appropriate board in the ISR. Neither check if board is NULL. Remove this nonsense. Signed-off-by: Jiri Slaby Link: https://lore.kernel.org/r/20210618061516.662-12-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index db594a64ff004..6602b27412712 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -2207,23 +2207,13 @@ static void mxser_transmit_chars(struct tty_struct *tty, struct mxser_port *port static irqreturn_t mxser_interrupt(int irq, void *dev_id) { int status, iir, i; - struct mxser_board *brd = NULL; + struct mxser_board *brd = dev_id; struct mxser_port *port; int max, irqbits, bits, msr; unsigned int int_cnt, pass_counter = 0; int handled = IRQ_NONE; struct tty_struct *tty; - for (i = 0; i < MXSER_BOARDS; i++) - if (dev_id == &mxser_boards[i]) { - brd = dev_id; - break; - } - - if (i == MXSER_BOARDS) - goto irq_stop; - if (brd == NULL) - goto irq_stop; max = brd->info->nports; while (pass_counter++ < MXSER_ISR_PASS_LIMIT) { irqbits = inb(brd->vector) & brd->vector_mask; @@ -2299,7 +2289,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id) } } -irq_stop: return handled; }