From owner-svn-src-head@FreeBSD.ORG  Sun May  2 19:07:19 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8F322106566B;
	Sun,  2 May 2010 19:07:19 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F2178FC1C;
	Sun,  2 May 2010 19:07:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o42J7J21047314;
	Sun, 2 May 2010 19:07:19 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42J7JXq047311;
	Sun, 2 May 2010 19:07:19 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201005021907.o42J7JXq047311@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 2 May 2010 19:07:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207533 - in head/sys: dev/uart mips/cavium
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 May 2010 19:07:19 -0000

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)