2017-04-28 13:09:10

by Geert Uytterhoeven

Subject: [PATCH v2] clk: Provide dummy of_clk_get_from_provider() for compile-testing

When CONFIG_ON=n, dummies are provided for of_clk_get() and
of_clk_get_by_name(), but not for of_clk_get_from_provider().

Provide a dummy for the latter, to improve the ability to do
compile-testing. This requires removing the existing dummy in the
Lantiq clock code.

Fixes: 766e6a4ec602d0c1 ("clk: add DT clock binding support")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
v2:
- Remove conflicting dummy in Lantiq clock code (reported by 0day).
---
arch/mips/lantiq/clk.c | 5 -----
include/linux/clk.h | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
index 149f0513c4f5d0d4..a263d1b751ffe48d 100644
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
@@ -160,11 +160,6 @@ void clk_deactivate(struct clk *clk)
}
EXPORT_SYMBOL(clk_deactivate);

-struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
-{
- return NULL;
-}
-
static inline u32 get_counter_resolution(void)
{
u32 res;
diff --git a/include/linux/clk.h b/include/linux/clk.h
index e9d36b3e49de5b1b..3ed97abb5cbb7f94 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -539,6 +539,10 @@ static inline struct clk *of_clk_get_by_name(struct device_node *np,
{
return ERR_PTR(-ENOENT);
}
+static inline struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
+{
+ return ERR_PTR(-ENOENT);
+}
#endif

#endif
--
2.7.4

2017-04-28 14:57:36

by Langer, Thomas

Subject: RE: [PATCH v2] clk: Provide dummy of_clk_get_from_provider() for compile-testing

> -----Original Message-----
> From: [email protected] [mailto:devicetree-
> [email protected]] On Behalf Of Geert Uytterhoeven
> Sent: Friday, April 28, 2017 3:09 PM
> To: Michael Turquette <[email protected]>; Stephen Boyd
> <[email protected]>; Russell King <[email protected]>; Rob Herring
> <[email protected]>; Mark Rutland <[email protected]>; John Crispin
> <[email protected]>; Ralf Baechle <[email protected]>
> Cc: [email protected]; [email protected]; linux-
> [email protected]; [email protected]; Geert Uytterhoeven
> <[email protected]>
> Subject: [PATCH v2] clk: Provide dummy of_clk_get_from_provider() for
> compile-testing
>
> When CONFIG_ON=n, dummies are provided for of_clk_get() and
> of_clk_get_by_name(), but not for of_clk_get_from_provider().
>
> Provide a dummy for the latter, to improve the ability to do
> compile-testing. This requires removing the existing dummy in the
> Lantiq clock code.
>
> Fixes: 766e6a4ec602d0c1 ("clk: add DT clock binding support")
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Regarding the Lantiq part:
Acked-by: Thomas Langer <[email protected]>

> ---
> v2:
> - Remove conflicting dummy in Lantiq clock code (reported by 0day).
> ---
> arch/mips/lantiq/clk.c | 5 -----
> include/linux/clk.h | 4 ++++
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
> index 149f0513c4f5d0d4..a263d1b751ffe48d 100644
> --- a/arch/mips/lantiq/clk.c
> +++ b/arch/mips/lantiq/clk.c
> @@ -160,11 +160,6 @@ void clk_deactivate(struct clk *clk)
> }
> EXPORT_SYMBOL(clk_deactivate);
>
> -struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
> -{
> - return NULL;
> -}
> -
> static inline u32 get_counter_resolution(void)
> {
> u32 res;
> diff --git a/include/linux/clk.h b/include/linux/clk.h
> index e9d36b3e49de5b1b..3ed97abb5cbb7f94 100644
> --- a/include/linux/clk.h
> +++ b/include/linux/clk.h
> @@ -539,6 +539,10 @@ static inline struct clk *of_clk_get_by_name(struct
> device_node *np,
> {
> return ERR_PTR(-ENOENT);
> }
> +static inline struct clk *of_clk_get_from_provider(struct of_phandle_args
> *clkspec)
> +{
> + return ERR_PTR(-ENOENT);
> +}
> #endif
>
> #endif
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2017-06-02 17:49:15

by Stephen Boyd

Subject: Re: [PATCH v2] clk: Provide dummy of_clk_get_from_provider() for compile-testing

On 04/28, Geert Uytterhoeven wrote:
> When CONFIG_ON=n, dummies are provided for of_clk_get() and
> of_clk_get_by_name(), but not for of_clk_get_from_provider().
>
> Provide a dummy for the latter, to improve the ability to do
> compile-testing. This requires removing the existing dummy in the
> Lantiq clock code.
>
> Fixes: 766e6a4ec602d0c1 ("clk: add DT clock binding support")
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Applied to clk-next

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project