Skip to contentSkip to conversation

build with GCC 4.8

PATCH New Peter Kümmel 2 participants 2 messages Feb 14, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build with GCC 4.8

---
 package/ti-gfx/ti-gfx-newclkapi.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ti-gfx/ti-gfx-newclkapi.patch +2 -2
index 8f50c7e..29ad20d 100644
@@ -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)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 build with GCC 4.8

Dear Peter K?mmel,

Thanks for your contribution!

The commit title should indicate the package on which the modification is made.

Quoted 10 lines · Peter K?mmel
---
 package/ti-gfx/ti-gfx-newclkapi.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ti-gfx/ti-gfx-newclkapi.patch +0 -0
index 8f50c7e..29ad20d 100644

package/ti-gfx/ti-gfx-newclkapi.patch Index: ti-gfx-4_09_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c · line 17

Quoted 5 lines
package/ti-gfx/ti-gfx-newclkapi.patch +1 -1
@@ -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;

And your commit log should have more details to explain how the change you're doing is related to GCC 4.8. I guess something like:
"clk_disable() and clk_enable() return void, and therefore they return value is not compatible with the return value of the stub clk_disable_unprepare() and clk_prepare_enable() functions".

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com