diff mbox

[U-Boot,v6,01/12] clk: Use dummy clk_get_by_* functions when CONFIG_CLK is disabled

Message ID 20160804102942.9755-2-paul.burton@imgtec.com
State Accepted
Commit 3f96f87520c22efe4a8b43f45f1b2011da50dc06
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Paul Burton Aug. 4, 2016, 10:29 a.m. UTC
The implementations of clk_get_by_index & clk_get_by_name are only
available when CONFIG_CLK is enabled. Provide the dummies when this is
not the case in order to avoid build failures.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>

---

Changes in v6:
- New patch

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 include/clk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass Aug. 5, 2016, 1:36 a.m. UTC | #1
Hi Paul,

On 4 August 2016 at 04:29, Paul Burton <paul.burton@imgtec.com> wrote:
> The implementations of clk_get_by_index & clk_get_by_name are only
> available when CONFIG_CLK is enabled. Provide the dummies when this is
> not the case in order to avoid build failures.

Where are the dummies?

>
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
>
> ---
>
> Changes in v6:
> - New patch
>
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
>  include/clk.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/clk.h b/include/clk.h
> index 161bc28..27b1d2c 100644
> --- a/include/clk.h
> +++ b/include/clk.h
> @@ -59,7 +59,7 @@ struct clk {
>         unsigned long id;
>  };
>
> -#if CONFIG_IS_ENABLED(OF_CONTROL)
> +#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK)
>  struct phandle_2_cell;
>  int clk_get_by_index_platdata(struct udevice *dev, int index,
>                               struct phandle_2_cell *cells, struct clk *clk);
> --
> 2.9.2
>

Regards,
Simon
Paul Burton Aug. 5, 2016, 8:30 a.m. UTC | #2
On 05/08/16 02:36, Simon Glass wrote:
> Hi Paul,
>
> On 4 August 2016 at 04:29, Paul Burton <paul.burton@imgtec.com> wrote:
>> The implementations of clk_get_by_index & clk_get_by_name are only
>> available when CONFIG_CLK is enabled. Provide the dummies when this is
>> not the case in order to avoid build failures.
>
> Where are the dummies?

Hi Simon,

I mean the static inline versions which just return -ENOSYS, which 
already exist in clk.h but weren't provided before unless 
CONFIG_OF_CONTROL wasn't set.

Thanks,
     Paul

>
>>
>> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
>>
>> ---
>>
>> Changes in v6:
>> - New patch
>>
>> Changes in v5: None
>> Changes in v4: None
>> Changes in v3: None
>> Changes in v2: None
>>
>>  include/clk.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/clk.h b/include/clk.h
>> index 161bc28..27b1d2c 100644
>> --- a/include/clk.h
>> +++ b/include/clk.h
>> @@ -59,7 +59,7 @@ struct clk {
>>         unsigned long id;
>>  };
>>
>> -#if CONFIG_IS_ENABLED(OF_CONTROL)
>> +#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK)
>>  struct phandle_2_cell;
>>  int clk_get_by_index_platdata(struct udevice *dev, int index,
>>                               struct phandle_2_cell *cells, struct clk *clk);
>> --
>> 2.9.2
>>
>
> Regards,
> Simon
>
Simon Glass Aug. 8, 2016, 9:44 p.m. UTC | #3
On 5 August 2016 at 02:30, Paul Burton <paul.burton@imgtec.com> wrote:
>
>
> On 05/08/16 02:36, Simon Glass wrote:
>>
>> Hi Paul,
>>
>> On 4 August 2016 at 04:29, Paul Burton <paul.burton@imgtec.com> wrote:
>>>
>>> The implementations of clk_get_by_index & clk_get_by_name are only
>>> available when CONFIG_CLK is enabled. Provide the dummies when this is
>>> not the case in order to avoid build failures.
>>
>>
>> Where are the dummies?
>
>
> Hi Simon,
>
> I mean the static inline versions which just return -ENOSYS, which already
> exist in clk.h but weren't provided before unless CONFIG_OF_CONTROL wasn't
> set.
>
> Thanks,
>     Paul

Reviewed-by: Simon Glass <sjg@chromium.org>

[...]
diff mbox

Patch

diff --git a/include/clk.h b/include/clk.h
index 161bc28..27b1d2c 100644
--- a/include/clk.h
+++ b/include/clk.h
@@ -59,7 +59,7 @@  struct clk {
 	unsigned long id;
 };
 
-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(CLK)
 struct phandle_2_cell;
 int clk_get_by_index_platdata(struct udevice *dev, int index,
 			      struct phandle_2_cell *cells, struct clk *clk);