The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a82907ed131a093a4fcc1960fc5ae162bf29bb7c
commit a82907ed131a093a4fcc1960fc5ae162bf29bb7c Author: Adrian Chadd <[email protected]> AuthorDate: 2021-12-26 14:16:02 +0000 Commit: Adrian Chadd <[email protected]> CommitDate: 2021-12-26 14:16:02 +0000 clk: rename clknode_try_freq to clknode_test_freq This brings it in line with what the clk_*_freq routines are named. --- sys/dev/extres/clk/clk.c | 2 +- sys/dev/extres/clk/clk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/extres/clk/clk.c b/sys/dev/extres/clk/clk.c index 2be233c465a9..26034a91919f 100644 --- a/sys/dev/extres/clk/clk.c +++ b/sys/dev/extres/clk/clk.c @@ -1049,7 +1049,7 @@ clknode_set_freq(struct clknode *clknode, uint64_t freq, int flags, } int -clknode_try_freq(struct clknode *clknode, uint64_t freq, int flags, +clknode_test_freq(struct clknode *clknode, uint64_t freq, int flags, int enablecnt, uint64_t *out_freq) { int rv; diff --git a/sys/dev/extres/clk/clk.h b/sys/dev/extres/clk/clk.h index 5daf3c0731ee..68a7811a736f 100644 --- a/sys/dev/extres/clk/clk.h +++ b/sys/dev/extres/clk/clk.h @@ -115,7 +115,7 @@ struct clknode *clknode_find_by_id(struct clkdom *clkdom, intptr_t id); int clknode_get_freq(struct clknode *clknode, uint64_t *freq); int clknode_set_freq(struct clknode *clknode, uint64_t freq, int flags, int enablecnt); -int clknode_try_freq(struct clknode *clknode, uint64_t freq, int flags, +int clknode_test_freq(struct clknode *clknode, uint64_t freq, int flags, int enablecnt, uint64_t *out_freq); int clknode_enable(struct clknode *clknode); int clknode_disable(struct clknode *clknode);
