From owner-svn-src-head@freebsd.org Mon Nov 4 02:29:59 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FC291B0210; Mon, 4 Nov 2019 02:29:59 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 475xbC1Kfpz3LgT; Mon, 4 Nov 2019 02:29:59 +0000 (UTC) (envelope-from wulf@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 0C8391D4A7; Mon, 4 Nov 2019 02:29:59 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA42Tw65067401; Mon, 4 Nov 2019 02:29:58 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA42Tw98067400; Mon, 4 Nov 2019 02:29:58 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201911040229.xA42Tw98067400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev Date: Mon, 4 Nov 2019 02:29:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354327 - head/sys/dev/ichiic X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/ichiic X-SVN-Commit-Revision: 354327 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.29 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: Mon, 04 Nov 2019 02:29:59 -0000 Author: wulf Date: Mon Nov 4 02:29:58 2019 New Revision: 354327 URL: https://svnweb.freebsd.org/changeset/base/354327 Log: [ig4] Try to workaround MIPS namespace pollution issue Modified: head/sys/dev/ichiic/ig4_iic.c Modified: head/sys/dev/ichiic/ig4_iic.c ============================================================================== --- head/sys/dev/ichiic/ig4_iic.c Mon Nov 4 00:35:40 2019 (r354326) +++ head/sys/dev/ichiic/ig4_iic.c Mon Nov 4 02:29:58 2019 (r354327) @@ -161,7 +161,7 @@ reg_read(ig4iic_softc_t *sc, uint32_t reg) } static void -set_intr_mask(ig4iic_softc_t *sc, uint32_t val) +ig4iic_set_intr_mask(ig4iic_softc_t *sc, uint32_t val) { if (sc->intr_mask != val) { reg_write(sc, IG4_REG_INTR_MASK, val); @@ -233,7 +233,7 @@ set_controller(ig4iic_softc_t *sc, uint32_t ctl) * When the controller is enabled, interrupt on STOP detect * or receive character ready and clear pending interrupts. */ - set_intr_mask(sc, 0); + ig4iic_set_intr_mask(sc, 0); if (ctl & IG4_I2C_ENABLE) reg_read(sc, IG4_REG_CLR_INTR); @@ -298,10 +298,10 @@ wait_intr(ig4iic_softc_t *sc, uint32_t intr) */ if (!DO_POLL(sc)) { mtx_lock_spin(&sc->io_lock); - set_intr_mask(sc, intr | IG4_INTR_ERR_MASK); + ig4iic_set_intr_mask(sc, intr | IG4_INTR_ERR_MASK); msleep_spin(sc, &sc->io_lock, "i2cwait", (hz + 99) / 100); /* sleep up to 10ms */ - set_intr_mask(sc, 0); + ig4iic_set_intr_mask(sc, 0); mtx_unlock_spin(&sc->io_lock); count_us += 10000; } else { @@ -1137,7 +1137,7 @@ ig4iic_intr(void *cookie) /* Ignore stray interrupts */ if (sc->intr_mask != 0 && reg_read(sc, IG4_REG_INTR_STAT) != 0) { /* Interrupt bits are cleared in wait_intr() loop */ - set_intr_mask(sc, 0); + ig4iic_set_intr_mask(sc, 0); wakeup(sc); retval = FILTER_HANDLED; }