Re: [PATCH v2 1/3] clk: abstract parent cache

From: Mike Turquette
Date: Mon May 13 2013 - 16:01:33 EST


Quoting James Hogan (2013-04-19 09:28:22)
> Abstract access to the clock parent cache by defining
> __clk_get_parent_by_index(clk, index). This allows access to parent
> clocks from clock drivers.
>
> Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
> ---
> drivers/clk/clk.c | 21 ++++++++++++++-------
> include/linux/clk-provider.h | 1 +
> 2 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index ed87b24..79d5deb 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -415,6 +415,19 @@ struct clk *__clk_get_parent(struct clk *clk)
> return !clk ? NULL : clk->parent;
> }
>
> +struct clk *__clk_get_parent_by_index(struct clk *clk, u8 index)

This looks good, but in the next version can you remove the double
underscore? I'm getting rid of a lot of those double underscore
helpers now that the reentrancy patch is merged and I think this is a
reasonable top-level API for a clock provider to have.

Thanks,
Mike

> +{
> + if (!clk || index >= clk->num_parents)
> + return NULL;
> + else if (!clk->parents)
> + return __clk_lookup(clk->parent_names[index]);
> + else if (!clk->parents[index])
> + return clk->parents[index] =
> + __clk_lookup(clk->parent_names[index]);
> + else
> + return clk->parents[index];
> +}
> +
> unsigned int __clk_get_enable_count(struct clk *clk)
> {
> return !clk ? 0 : clk->enable_count;
> @@ -1150,13 +1163,7 @@ static struct clk *__clk_init_parent(struct clk *clk)
> kzalloc((sizeof(struct clk*) * clk->num_parents),
> GFP_KERNEL);
>
> - if (!clk->parents)
> - ret = __clk_lookup(clk->parent_names[index]);
> - else if (!clk->parents[index])
> - ret = clk->parents[index] =
> - __clk_lookup(clk->parent_names[index]);
> - else
> - ret = clk->parents[index];
> + ret = __clk_get_parent_by_index(clk, index);
>
> out:
> return ret;
> diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
> index 7f197d7..4e0b634 100644
> --- a/include/linux/clk-provider.h
> +++ b/include/linux/clk-provider.h
> @@ -347,6 +347,7 @@ const char *__clk_get_name(struct clk *clk);
> struct clk_hw *__clk_get_hw(struct clk *clk);
> u8 __clk_get_num_parents(struct clk *clk);
> struct clk *__clk_get_parent(struct clk *clk);
> +struct clk *__clk_get_parent_by_index(struct clk *clk, u8 index);
> unsigned int __clk_get_enable_count(struct clk *clk);
> unsigned int __clk_get_prepare_count(struct clk *clk);
> unsigned long __clk_get_rate(struct clk *clk);
> --
> 1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/