Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] ti-gfx: build with GCC 4.8
@ 2014-02-14 15:29 Peter Kümmel
  2014-02-26 22:19 ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Kümmel @ 2014-02-14 15:29 UTC (permalink / raw)
  To: buildroot

In older kernels clk_disable() is a void function.

Signed-off-by: Peter K?mmel <syntheticpp@gmx.net>
---
 package/ti-gfx/ti-gfx-newclkapi.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ti-gfx/ti-gfx-newclkapi.patch b/package/ti-gfx/ti-gfx-newclkapi.patch
index 8f50c7e..29ad20d 100644
--- a/package/ti-gfx/ti-gfx-newclkapi.patch
+++ b/package/ti-gfx/ti-gfx-newclkapi.patch
@@ -14,7 +14,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
 +int clk_disable_unprepare(struct clk *clk)
 +{
-+	return clk_disable(clk);
++	clk_disable(clk); return 0;
 +}
 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
 +int clk_disable_unprepare(struct clk *clk)
@@ -35,7 +35,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
 +int clk_prepare_enable(struct clk *clk)
 +{
-+	return clk_enable(clk);
++	clk_enable(clk); return 0;
 +}
 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
 +int clk_prepare_enable(struct clk *clk)
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] ti-gfx: build with GCC 4.8
  2014-02-14 15:29 [Buildroot] [PATCH 1/1] ti-gfx: build with GCC 4.8 Peter Kümmel
@ 2014-02-26 22:19 ` Yann E. MORIN
  2014-02-27  6:14   ` Peter Kümmel
  0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2014-02-26 22:19 UTC (permalink / raw)
  To: buildroot

Peter, All,

On 2014-02-14 16:29 +0100, Peter K?mmel spake thusly:
> In older kernels clk_disable() is a void function.

Not only in older kernels, but in recent kernels, too.

For example, in v3.14-rc4:

    $ git grep 'void clk_disable' include
    include/linux/clk.h:void clk_disable(struct clk *clk);

> Signed-off-by: Peter K?mmel <syntheticpp@gmx.net>
> ---
>  package/ti-gfx/ti-gfx-newclkapi.patch | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/ti-gfx/ti-gfx-newclkapi.patch b/package/ti-gfx/ti-gfx-newclkapi.patch
> index 8f50c7e..29ad20d 100644
> --- a/package/ti-gfx/ti-gfx-newclkapi.patch
> +++ b/package/ti-gfx/ti-gfx-newclkapi.patch
> @@ -14,7 +14,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
>  +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
>  +int clk_disable_unprepare(struct clk *clk)
>  +{
> -+	return clk_disable(clk);
> ++	clk_disable(clk); return 0;
>  +}
>  +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
>  +int clk_disable_unprepare(struct clk *clk)
> @@ -35,7 +35,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
>  +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
>  +int clk_prepare_enable(struct clk *clk)
>  +{
> -+	return clk_enable(clk);
> ++	clk_enable(clk); return 0;

But why did you change clk_enable too? As far as I can see, it always
returned an int, for as long as it existed. Eg. in v2.6.19:

    $ git grep 'int clk_enable' include
    include/linux/clk.h:int clk_enable(struct clk *clk);

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] ti-gfx: build with GCC 4.8
  2014-02-26 22:19 ` Yann E. MORIN
@ 2014-02-27  6:14   ` Peter Kümmel
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Kümmel @ 2014-02-27  6:14 UTC (permalink / raw)
  To: buildroot

On 26.02.2014 23:19, Yann E. MORIN wrote:
> Peter, All,
>
> On 2014-02-14 16:29 +0100, Peter K?mmel spake thusly:
>> In older kernels clk_disable() is a void function.
>
> Not only in older kernels, but in recent kernels, too.
>
> For example, in v3.14-rc4:
>
>      $ git grep 'void clk_disable' include
>      include/linux/clk.h:void clk_disable(struct clk *clk);
>
>> Signed-off-by: Peter K?mmel <syntheticpp@gmx.net>
>> ---
>>   package/ti-gfx/ti-gfx-newclkapi.patch | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/ti-gfx/ti-gfx-newclkapi.patch b/package/ti-gfx/ti-gfx-newclkapi.patch
>> index 8f50c7e..29ad20d 100644
>> --- a/package/ti-gfx/ti-gfx-newclkapi.patch
>> +++ b/package/ti-gfx/ti-gfx-newclkapi.patch
>> @@ -14,7 +14,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
>>   +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
>>   +int clk_disable_unprepare(struct clk *clk)
>>   +{
>> -+	return clk_disable(clk);
>> ++	clk_disable(clk); return 0;
>>   +}
>>   +#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
>>   +int clk_disable_unprepare(struct clk *clk)
>> @@ -35,7 +35,7 @@ Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c
>>   +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
>>   +int clk_prepare_enable(struct clk *clk)
>>   +{
>> -+	return clk_enable(clk);
>> ++	clk_enable(clk); return 0;
>
> But why did you change clk_enable too? As far as I can see, it always
> returned an int, for as long as it existed. Eg. in v2.6.19:

Yes, this change was wrong.

>
>      $ git grep 'int clk_enable' include
>      include/linux/clk.h:int clk_enable(struct clk *clk);
>
> Regards,
> Yann E. MORIN.
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-02-27  6:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-14 15:29 [Buildroot] [PATCH 1/1] ti-gfx: build with GCC 4.8 Peter Kümmel
2014-02-26 22:19 ` Yann E. MORIN
2014-02-27  6:14   ` Peter Kümmel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox