diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-30 18:08:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-30 18:14:33 -0400 |
| commit | 23e354f82c04a1c070ca59907abc6b042761b0e7 (patch) | |
| tree | fc73baee17217f3b8c2f116a868eaa190a1bb0a4 /drivers/clk/clk_sandbox_test.c | |
| parent | d2e5250be49fce4653689c41a5dc7e2d7e7ecf33 (diff) | |
| parent | 682e73d23555afdd733c20810d282d9cc2bc0e0f (diff) | |
Merge tag 'clk-2022.04-next' of https://source.denx.de/u-boot/custodians/u-boot-clk into next
Clock patches for u-boot/next
This is mostly cleanups/consolidations. clk_free is made to return void, and the
CCF wrappers present in almost every CCF clock are consolidated. I would
particularly like to have the latter upstream, since there are at least two
series adding support for new CCF drivers (imx8mq and imxrt1170) which can
benefit from these commits.
I had to fix up the last commit since I missed an include for at91.
CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/11521
Diffstat (limited to 'drivers/clk/clk_sandbox_test.c')
| -rw-r--r-- | drivers/clk/clk_sandbox_test.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c index f665fd3cc45..5807a454f3b 100644 --- a/drivers/clk/clk_sandbox_test.c +++ b/drivers/clk/clk_sandbox_test.c @@ -137,14 +137,11 @@ int sandbox_clk_test_disable_bulk(struct udevice *dev) int sandbox_clk_test_free(struct udevice *dev) { struct sandbox_clk_test *sbct = dev_get_priv(dev); - int i, ret; + int i; devm_clk_put(dev, sbct->clkps[SANDBOX_CLK_TEST_ID_DEVM1]); - for (i = 0; i < SANDBOX_CLK_TEST_NON_DEVM_COUNT; i++) { - ret = clk_free(&sbct->clks[i]); - if (ret) - return ret; - } + for (i = 0; i < SANDBOX_CLK_TEST_NON_DEVM_COUNT; i++) + clk_free(&sbct->clks[i]); return 0; } |