From owner-svn-src-head@freebsd.org Tue Mar 15 15:25:28 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 3E294AD16EC; Tue, 15 Mar 2016 15:25:28 +0000 (UTC) (envelope-from mmel@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 E7DB41FD9; Tue, 15 Mar 2016 15:25:27 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2FFPQGh071366; Tue, 15 Mar 2016 15:25:26 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2FFPQaY071364; Tue, 15 Mar 2016 15:25:26 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201603151525.u2FFPQaY071364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Tue, 15 Mar 2016 15:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296903 - head/sys/dev/extres/clk 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.21 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: Tue, 15 Mar 2016 15:25:28 -0000 Author: mmel Date: Tue Mar 15 15:25:26 2016 New Revision: 296903 URL: https://svnweb.freebsd.org/changeset/base/296903 Log: CLK: Remove forgotten mutex from clk_fixed class. Modified: head/sys/dev/extres/clk/clk_fixed.c head/sys/dev/extres/clk/clk_fixed.h Modified: head/sys/dev/extres/clk/clk_fixed.c ============================================================================== --- head/sys/dev/extres/clk/clk_fixed.c Tue Mar 15 15:24:55 2016 (r296902) +++ head/sys/dev/extres/clk/clk_fixed.c Tue Mar 15 15:25:26 2016 (r296903) @@ -42,13 +42,9 @@ __FBSDID("$FreeBSD$"); #include -#define DEVICE_LOCK(_sc) mtx_lock((_sc)->mtx) -#define DEVICE_UNLOCK(_sc) mtx_unlock((_sc)->mtx) - static int clknode_fixed_init(struct clknode *clk, device_t dev); static int clknode_fixed_recalc(struct clknode *clk, uint64_t *freq); struct clknode_fixed_sc { - struct mtx *mtx; int fixed_flags; uint64_t freq; uint32_t mult; @@ -74,6 +70,7 @@ clknode_fixed_init(struct clknode *clk, clknode_init_parent_idx(clk, 0); return(0); } + static int clknode_fixed_recalc(struct clknode *clk, uint64_t *freq) { @@ -90,8 +87,7 @@ clknode_fixed_recalc(struct clknode *clk } int -clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef, - struct mtx *dev_mtx) +clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef) { struct clknode *clk; struct clknode_fixed_sc *sc; @@ -103,7 +99,6 @@ clknode_fixed_register(struct clkdom *cl return (1); sc = clknode_get_softc(clk); - sc->mtx = dev_mtx; sc->fixed_flags = clkdef->fixed_flags; sc->freq = clkdef->freq; sc->mult = clkdef->mult; Modified: head/sys/dev/extres/clk/clk_fixed.h ============================================================================== --- head/sys/dev/extres/clk/clk_fixed.h Tue Mar 15 15:24:55 2016 (r296902) +++ head/sys/dev/extres/clk/clk_fixed.h Tue Mar 15 15:25:26 2016 (r296903) @@ -47,7 +47,6 @@ struct clk_fixed_def { int fixed_flags; }; -int clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef, - struct mtx *dev_mtx); +int clknode_fixed_register(struct clkdom *clkdom, struct clk_fixed_def *clkdef); #endif /*_DEV_EXTRES_CLK_FIXED_H_*/