Patchwork ARM: OMAP2+: Fix compillation error in mach-omap2/timer.c

login
register
mail settings
Submitter Péter Ujfalusi
Date Dec. 19, 2012, 9:50 a.m.
Message ID <1355910609-31336-1-git-send-email-peter.ujfalusi@ti.com>
Download mbox | patch
Permalink /patch/207282/
State New
Headers show

Comments

Péter Ujfalusi - Dec. 19, 2012, 9:50 a.m.
prom_add_property() has been renamed to of_add_property()
This patch fixes the following comilation error:

arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’:
arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
Hi Tony,

today's mainline does not compile due to this API rename in of core.
Not sure if we alreasy have fix for this pending.

Regards,
Peter

 arch/arm/mach-omap2/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Bedia, Vaibhav - Dec. 19, 2012, 10:16 a.m.
Hi Peter, Tony

On Wed, Dec 19, 2012 at 15:20:09, Ujfalusi, Peter wrote:
> prom_add_property() has been renamed to of_add_property()

> This patch fixes the following comilation error:

> 

> arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’:

> arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration]

> cc1: some warnings being treated as errors

> make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1

> make[1]: *** Waiting for unfinished jobs....

> 

> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> ---

> Hi Tony,

> 

> today's mainline does not compile due to this API rename in of core.

> Not sure if we alreasy have fix for this pending.

> 


There following patches for needed to get omap2plus_defconfig build working

https://patchwork.kernel.org/patch/1810481/ - address the build breakage due to header file cleanup
https://patchwork.kernel.org/patch/1810441/ - address the prom_add_property() issue
http://marc.info/?l=linux-arm-kernel&m=135589966017628&w=2 - this crept in during a merge commit.
Tony Lindgren - Dec. 19, 2012, 4:38 p.m.
* Bedia, Vaibhav <vaibhav.bedia@ti.com> [121219 02:18]:
> Hi Peter, Tony
> 
> On Wed, Dec 19, 2012 at 15:20:09, Ujfalusi, Peter wrote:
> > prom_add_property() has been renamed to of_add_property()
> > This patch fixes the following comilation error:
> > 
> > arch/arm/mach-omap2/timer.c: In function ‘omap_get_timer_dt’:
> > arch/arm/mach-omap2/timer.c:178:3: error: implicit declaration of function ‘prom_add_property’ [-Werror=implicit-function-declaration]
> > cc1: some warnings being treated as errors
> > make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1
> > make[1]: *** Waiting for unfinished jobs....
> > 
> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> > ---
> > Hi Tony,
> > 
> > today's mainline does not compile due to this API rename in of core.
> > Not sure if we alreasy have fix for this pending.
> > 

Thanks applying.
 
> There following patches for needed to get omap2plus_defconfig build working
> 
> https://patchwork.kernel.org/patch/1810481/ - address the build breakage due to header file cleanup
> https://patchwork.kernel.org/patch/1810441/ - address the prom_add_property() issue
> http://marc.info/?l=linux-arm-kernel&m=135589966017628&w=2 - this crept in during a merge commit.

Thanks all these should be queued up somewhere now.

Regards,

Tony

Patch

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 7016637..cece724 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -175,7 +175,7 @@  static struct device_node * __init omap_get_timer_dt(struct of_device_id *match,
 			continue;
 		}
 
-		prom_add_property(np, &device_disabled);
+		of_add_property(np, &device_disabled);
 		return np;
 	}