From owner-svn-src-head@freebsd.org  Tue Aug 21 10:08:13 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F0A9106BB62;
 Tue, 21 Aug 2018 10:08:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B80D7C76A;
 Tue, 21 Aug 2018 10:08:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0C202284D;
 Tue, 21 Aug 2018 10:08:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7LA8C0s030063;
 Tue, 21 Aug 2018 10:08:12 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7LA8Cqm030062;
 Tue, 21 Aug 2018 10:08:12 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201808211008.w7LA8Cqm030062@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 21 Aug 2018 10:08:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338130 - head/sys/dev/mly
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/sys/dev/mly
X-SVN-Commit-Revision: 338130
X-SVN-Commit-Repository: base
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.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2018 10:08:13 -0000

Author: jhb
Date: Tue Aug 21 10:08:12 2018
New Revision: 338130
URL: https://svnweb.freebsd.org/changeset/base/338130

Log:
  De-spl mly(4).
  
  The driver already has mutex locking and holds its per-softc lock across
  calls to the one function that still used splcam().

Modified:
  head/sys/dev/mly/mly.c

Modified: head/sys/dev/mly/mly.c
==============================================================================
--- head/sys/dev/mly/mly.c	Tue Aug 21 09:35:56 2018	(r338129)
+++ head/sys/dev/mly/mly.c	Tue Aug 21 10:08:12 2018	(r338130)
@@ -1215,7 +1215,6 @@ mly_fetch_event(struct mly_softc *sc)
 {
     struct mly_command		*mc;
     struct mly_command_ioctl	*mci;
-    int				s;
     u_int32_t			event;
 
     debug_called(1);
@@ -1237,14 +1236,11 @@ mly_fetch_event(struct mly_softc *sc)
      * Get an event number to fetch.  It's possible that we've raced with another
      * context for the last event, in which case there will be no more events.
      */
-    s = splcam();
     if (sc->mly_event_counter == sc->mly_event_waiting) {
 	mly_release_command(mc);
-	splx(s);
 	return;
     }
     event = sc->mly_event_counter++;
-    splx(s);
 
     /* 
      * Build the ioctl.