From f6ffc3c26bf8738c43c84b0161aa50d6e27232e1 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Sun, 2 May 2010 19:07:19 +0000 Subject: [PATCH] Remove redundant checking of sc_leaving (uart_intr() already handles this). Approved by: marcel --- sys/dev/uart/uart_dev_ns8250.c | 2 +- sys/mips/cavium/uart_dev_oct16550.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index c01fd615009..b93e254d519 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -604,7 +604,7 @@ ns8250_bus_ipend(struct uart_softc *sc) if (ipend == 0) ns8250_clrint(bas); uart_unlock(sc->sc_hwmtx); - return ((sc->sc_leaving) ? 0 : ipend); + return (ipend); } static int diff --git a/sys/mips/cavium/uart_dev_oct16550.c b/sys/mips/cavium/uart_dev_oct16550.c index 3e6d7c7cce7..5c6e11ee59c 100644 --- a/sys/mips/cavium/uart_dev_oct16550.c +++ b/sys/mips/cavium/uart_dev_oct16550.c @@ -644,12 +644,9 @@ oct16550_bus_ipend(struct uart_softc *sc) if (ipend) octeon_led_run_wheel(&where1, 6 + device_get_unit(sc->sc_dev)); #endif - return ((sc->sc_leaving) ? 0 : ipend); + return (ipend); } - - - static int oct16550_bus_param (struct uart_softc *sc, int baudrate, int databits, int stopbits, int parity)