diff options
| author | marius <marius@FreeBSD.org> | 2010-05-02 19:07:19 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-05-02 19:07:19 +0000 |
| commit | 6637c2369d116e42113a80f7912a0b5a2d9e7fbf (patch) | |
| tree | 24fe15dca539a633b9fcacb8cdceeaaff59d9250 | |
| parent | 5af1cc0b3d39d86988e33262f6c84b4609244a9a (diff) | |
| download | FreeBSD-src-6637c2369d116e42113a80f7912a0b5a2d9e7fbf.zip FreeBSD-src-6637c2369d116e42113a80f7912a0b5a2d9e7fbf.tar.gz | |
Remove redundant checking of sc_leaving (uart_intr() already handles this).
Approved by: marcel
| -rw-r--r-- | sys/dev/uart/uart_dev_ns8250.c | 2 | ||||
| -rw-r--r-- | 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 c01fd61..b93e254 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 3e6d7c7..5c6e11e 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) |
