From owner-svn-src-stable@FreeBSD.ORG Sat Jan 4 21:32:55 2014 Return-Path: Delivered-To: svn-src-stable@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 B4A9F9D6; Sat, 4 Jan 2014 21:32:55 +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 862B212F4; Sat, 4 Jan 2014 21:32:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LWtC9012806; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LWtjA012805; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042132.s04LWtjA012805@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:32:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260287 - in stable: 10/sys/dev/scc 7/sys/dev/scc 8/sys/dev/scc 9/sys/dev/scc X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:32:55 -0000 Author: dim Date: Sat Jan 4 21:32:53 2014 New Revision: 260287 URL: http://svnweb.freebsd.org/changeset/base/260287 Log: MFC r260057: In sys/dev/scc, remove unused static function scc_setmreg(). While here, invoke scc_getmreg() in two more places where it can be used. Reviewed by: marcel Modified: stable/7/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/scc/scc_dev_z8530.c stable/8/sys/dev/scc/scc_dev_z8530.c stable/9/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/scc/scc_dev_z8530.c ============================================================================== --- stable/7/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:23:49 2014 (r260286) +++ stable/7/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:32:53 2014 (r260287) @@ -66,15 +66,6 @@ struct scc_class scc_z8530_class = { }; /* Multiplexed I/O. */ -static __inline void -scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) -{ - - scc_setreg(bas, ch + REG_CTRL, reg); - scc_barrier(bas); - scc_setreg(bas, ch + REG_CTRL, val); -} - static __inline uint8_t scc_getmreg(struct scc_bas *bas, int ch, int reg) { @@ -148,9 +139,7 @@ z8530_bfe_ipend(struct scc_softc *sc) if (ip & IP_TIB) ch[1]->ch_ipend |= SER_INT_TXIDLE; if (ip & IP_SIA) { - scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_A + REG_CTRL); + bes = scc_getmreg(bas, CHAN_A, CR_RSTXSI); if (bes & BES_BRK) ch[0]->ch_ipend |= SER_INT_BREAK; sig = ch[0]->ch_hwsig; @@ -166,9 +155,7 @@ z8530_bfe_ipend(struct scc_softc *sc) ch[0]->ch_ipend |= SER_INT_OVERRUN; } if (ip & IP_SIB) { - scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_B + REG_CTRL); + bes = scc_getmreg(bas, CHAN_B, CR_RSTXSI); if (bes & BES_BRK) ch[1]->ch_ipend |= SER_INT_BREAK; sig = ch[1]->ch_hwsig;