From owner-svn-src-all@freebsd.org Fri May 25 17:31:44 2018 Return-Path: Delivered-To: svn-src-all@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 02C1EEEEDBC; Fri, 25 May 2018 17:31:44 +0000 (UTC) (envelope-from emaste@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 AC7AD6AF17; Fri, 25 May 2018 17:31:43 +0000 (UTC) (envelope-from emaste@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 8D50323F48; Fri, 25 May 2018 17:31:43 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PHVhKF029198; Fri, 25 May 2018 17:31:43 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PHVhDU029197; Fri, 25 May 2018 17:31:43 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201805251731.w4PHVhDU029197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 25 May 2018 17:31:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334213 - head/sys/dev/usb/net X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/dev/usb/net X-SVN-Commit-Revision: 334213 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2018 17:31:44 -0000 Author: emaste Date: Fri May 25 17:31:43 2018 New Revision: 334213 URL: https://svnweb.freebsd.org/changeset/base/334213 Log: if_muge: Use lock assertion instead of broken locking in lan78xx_chip_init Previously lan78xx_chip_init locked the driver's mutex if not already locked, but unlocked it only in the case of error. This provided a fairly clear indication that the function is already called with the lock held, so just replace it with a lock assertion. Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/usb/net/if_muge.c Modified: head/sys/dev/usb/net/if_muge.c ============================================================================== --- head/sys/dev/usb/net/if_muge.c Fri May 25 17:29:29 2018 (r334212) +++ head/sys/dev/usb/net/if_muge.c Fri May 25 17:31:43 2018 (r334213) @@ -953,13 +953,10 @@ static int lan78xx_chip_init(struct muge_softc *sc) { int err; - int locked; uint32_t buf; uint32_t burst_cap; - locked = mtx_owned(&sc->sc_mtx); - if (!locked) - MUGE_LOCK(sc); + MUGE_LOCK_ASSERT(sc, MA_OWNED); /* Enter H/W config mode. */ lan78xx_write_reg(sc, ETH_HW_CFG, ETH_HW_CFG_LRST_); @@ -1132,9 +1129,6 @@ lan78xx_chip_init(struct muge_softc *sc) return (0); init_failed: - if (!locked) - MUGE_UNLOCK(sc); - muge_err_printf(sc, "lan78xx_chip_init failed (err=%d)\n", err); return (err); }