Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24c71c83 authored by Tomeu Vizoso's avatar Tomeu Vizoso Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Remove direct access to prepare_count field of struct clk 



Replacing it with a call to __clk_is_prepared(), which isn't entirely
equivalent but in practice shouldn't matter.

Signed-off-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8120/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a45da565

arch/mips/alchemy/common/clock.c

+3 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/io.h>

#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/clk-private.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/types.h>
@@ -397,10 +396,10 @@ static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate, 
			break;



		/* if this parent is currently unused, remember it.

		 * XXX: I know it's a layering violation, but it works

		 * so well.. (if (!clk_has_active_children(pc)) )

		 * XXX: we would actually want clk_has_active_children()

		 * but this is a good-enough approximation for now.

		 */

		if (pc->prepare_count == 0) {

		if (!__clk_is_prepared(pc)) {

			if (!free)

				free = pc;

		}