diff options
Diffstat (limited to 'arch/mips/alchemy/common/clock.c')
-rw-r--r-- | arch/mips/alchemy/common/clock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c index d7557cde271a..203e4403c366 100644 --- a/arch/mips/alchemy/common/clock.c +++ b/arch/mips/alchemy/common/clock.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
38 | #include <linux/clk-provider.h> | 38 | #include <linux/clk-provider.h> |
39 | #include <linux/clkdev.h> | 39 | #include <linux/clkdev.h> |
40 | #include <linux/clk-private.h> | ||
41 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
42 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
43 | #include <linux/types.h> | 42 | #include <linux/types.h> |
@@ -397,10 +396,10 @@ static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate, | |||
397 | break; | 396 | break; |
398 | 397 | ||
399 | /* if this parent is currently unused, remember it. | 398 | /* if this parent is currently unused, remember it. |
400 | * XXX: I know it's a layering violation, but it works | 399 | * XXX: we would actually want clk_has_active_children() |
401 | * so well.. (if (!clk_has_active_children(pc)) ) | 400 | * but this is a good-enough approximation for now. |
402 | */ | 401 | */ |
403 | if (pc->prepare_count == 0) { | 402 | if (!__clk_is_prepared(pc)) { |
404 | if (!free) | 403 | if (!free) |
405 | free = pc; | 404 | free = pc; |
406 | } | 405 | } |