svn commit: r207533 - in head/sys: dev/uart mips/cavium

Marius Strobl marius at FreeBSD.org
Sun May 2 19:07:19 UTC 2010


Author: marius
Date: Sun May  2 19:07:19 2010
New Revision: 207533
URL: http://svn.freebsd.org/changeset/base/207533

Log:
  Remove redundant checking of sc_leaving (uart_intr() already handles this).
  
  Approved by:	marcel

Modified:
  head/sys/dev/uart/uart_dev_ns8250.c
  head/sys/mips/cavium/uart_dev_oct16550.c

Modified: head/sys/dev/uart/uart_dev_ns8250.c
==============================================================================
--- head/sys/dev/uart/uart_dev_ns8250.c	Sun May  2 19:05:57 2010	(r207532)
+++ head/sys/dev/uart/uart_dev_ns8250.c	Sun May  2 19:07:19 2010	(r207533)
@@ -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

Modified: head/sys/mips/cavium/uart_dev_oct16550.c
==============================================================================
--- head/sys/mips/cavium/uart_dev_oct16550.c	Sun May  2 19:05:57 2010	(r207532)
+++ head/sys/mips/cavium/uart_dev_oct16550.c	Sun May  2 19:07:19 2010	(r207533)
@@ -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)


More information about the svn-src-all mailing list