From owner-svn-src-head@FreeBSD.ORG  Mon Jan 20 17:45:36 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B740912A;
 Mon, 20 Jan 2014 17:45:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A28661855;
 Mon, 20 Jan 2014 17:45:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KHjap4089268;
 Mon, 20 Jan 2014 17:45:36 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KHjaZT089267;
 Mon, 20 Jan 2014 17:45:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201401201745.s0KHjaZT089267@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 20 Jan 2014 17:45:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260911 - head/sys/dev/uart
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 20 Jan 2014 17:45:36 -0000

Author: imp
Date: Mon Jan 20 17:45:36 2014
New Revision: 260911
URL: http://svnweb.freebsd.org/changeset/base/260911

Log:
  Don't lock in the generic grab just to lock again in the specific grabs.
  (I committed the wrong version of uart_core.c, which still had this).
  
  Pointy hat: imp

Modified:
  head/sys/dev/uart/uart_core.c

Modified: head/sys/dev/uart/uart_core.c
==============================================================================
--- head/sys/dev/uart/uart_core.c	Mon Jan 20 15:51:02 2014	(r260910)
+++ head/sys/dev/uart/uart_core.c	Mon Jan 20 17:45:36 2014	(r260911)
@@ -629,18 +629,14 @@ void
 uart_grab(struct uart_devinfo *di)
 {
 
-	uart_lock(di->hwmtx);
 	if (di->sc)
 		UART_GRAB(di->sc);
-	uart_unlock(di->hwmtx);
 }
 
 void
 uart_ungrab(struct uart_devinfo *di)
 {
 
-	uart_lock(di->hwmtx);
 	if (di->sc)
 		UART_UNGRAB(di->sc);
-	uart_unlock(di->hwmtx);
 }