Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 15 Mar 2016 15:25:26 +0000 (UTC)
From:      Michal Meloun <mmel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r296903 - head/sys/dev/extres/clk
Message-ID:  <201603151525.u2FFPQaY071364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <dev/extres/clk/clk_fixed.h>
 
-#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_*/

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603151525.u2FFPQaY071364>