From owner-svn-src-head@freebsd.org Sat Jul 9 18:43:16 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B13FCB84968; Sat, 9 Jul 2016 18:43:16 +0000 (UTC) (envelope-from ian@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 mx1.freebsd.org (Postfix) with ESMTPS id 7E1A51322; Sat, 9 Jul 2016 18:43:16 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u69IhFSG050502; Sat, 9 Jul 2016 18:43:15 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u69IhFnw050500; Sat, 9 Jul 2016 18:43:15 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201607091843.u69IhFnw050500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sat, 9 Jul 2016 18:43:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302502 - in head/sys/arm: lpc samsung/exynos 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.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2016 18:43:16 -0000 Author: ian Date: Sat Jul 9 18:43:15 2016 New Revision: 302502 URL: https://svnweb.freebsd.org/changeset/base/302502 Log: Correct syntax errors that only show up when compiled with INVARIANTS. Modified: head/sys/arm/lpc/if_lpe.c head/sys/arm/samsung/exynos/chrome_kb.c Modified: head/sys/arm/lpc/if_lpe.c ============================================================================== --- head/sys/arm/lpc/if_lpe.c Sat Jul 9 17:48:45 2016 (r302501) +++ head/sys/arm/lpc/if_lpe.c Sat Jul 9 18:43:15 2016 (r302502) @@ -172,7 +172,7 @@ static void lpe_ifmedia_sts(struct ifnet #define lpe_lock(_sc) mtx_lock(&(_sc)->lpe_mtx) #define lpe_unlock(_sc) mtx_unlock(&(_sc)->lpe_mtx) -#define lpe_lock_assert(sc) mtx_assert(&(_sc)->lpe_mtx, MA_OWNED) +#define lpe_lock_assert(_sc) mtx_assert(&(_sc)->lpe_mtx, MA_OWNED) #define lpe_read_4(_sc, _reg) \ bus_space_read_4((_sc)->lpe_bst, (_sc)->lpe_bsh, (_reg)) Modified: head/sys/arm/samsung/exynos/chrome_kb.c ============================================================================== --- head/sys/arm/samsung/exynos/chrome_kb.c Sat Jul 9 17:48:45 2016 (r302501) +++ head/sys/arm/samsung/exynos/chrome_kb.c Sat Jul 9 18:43:15 2016 (r302502) @@ -310,7 +310,7 @@ static uint16_t keymap_read(struct ckb_softc *sc, int col, int row) { - KASSERT(sc->keymap != NULL, "keymap_read: no keymap"); + KASSERT(sc->keymap != NULL, ("keymap_read: no keymap")); if (col >= 0 && col < sc->cols && row >= 0 && row < sc->rows) { return sc->keymap[row * sc->cols + col]; @@ -323,7 +323,7 @@ static int keymap_write(struct ckb_softc *sc, int col, int row, uint16_t key) { - KASSERT(sc->keymap != NULL, "keymap_write: no keymap"); + KASSERT(sc->keymap != NULL, ("keymap_write: no keymap")); if (col >= 0 && col < sc->cols && row >= 0 && row < sc->rows) { sc->keymap[row * sc->cols + col] = key;