From 3ad8c0e5a179a6321436e59e5f1748abf728f928 Mon Sep 17 00:00:00 2001 From: Michal Meloun Date: Tue, 15 Mar 2016 15:25:26 +0000 Subject: [PATCH] CLK: Remove forgotten mutex from clk_fixed class. --- sys/dev/extres/clk/clk_fixed.c | 9 ++------- sys/dev/extres/clk/clk_fixed.h | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/dev/extres/clk/clk_fixed.c b/sys/dev/extres/clk/clk_fixed.c index 4ddceae5a927..de0d9bbf3175 100644 --- a/sys/dev/extres/clk/clk_fixed.c +++ b/sys/dev/extres/clk/clk_fixed.c @@ -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, device_t dev) 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, uint64_t *freq) } 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 *clkdom, struct clk_fixed_def *clkdef, 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; diff --git a/sys/dev/extres/clk/clk_fixed.h b/sys/dev/extres/clk/clk_fixed.h index f57ee960d71a..e2643ff7d488 100644 --- a/sys/dev/extres/clk/clk_fixed.h +++ b/sys/dev/extres/clk/clk_fixed.h @@ -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_*/