Message ID | 20121224012456.13698.41839.stgit@dusk.lan (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Monday 24 December 2012 06:54 AM, Paul Walmsley wrote: > Commit 1fe97c8f6a1de67a5f56e029a818903d5bed8017 ("ARM: OMAP: Make OMAP > clocksource source selection using kernel param") results in a new warning > from sparse: > > arch/arm/plat-omap/counter_32k.c:86:12: warning: symbol 'omap_init_clocksource_32k' was not declared. Should it be static? > > Fix by adding a temporary header file, needed until the 32k counter > code is moved to drivers/. > arch/arm/plat-omap/include/plat/counter-32k.h can't be added due to > ARM CONFIG_ARCH_MULTIPLATFORM restrictions on the use of the "plat/" > include path shortcut. > > Signed-off-by: Paul Walmsley <paul@pwsan.com> Looks good to my eyes. Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com>
Hi, Sorry for the delay, just noticed this looking at your pull request. * Paul Walmsley <paul@pwsan.com> [121223 17:30]: > Commit 1fe97c8f6a1de67a5f56e029a818903d5bed8017 ("ARM: OMAP: Make OMAP > clocksource source selection using kernel param") results in a new warning > from sparse: > > arch/arm/plat-omap/counter_32k.c:86:12: warning: symbol 'omap_init_clocksource_32k' was not declared. Should it be static? > > Fix by adding a temporary header file, needed until the 32k counter > code is moved to drivers/. > arch/arm/plat-omap/include/plat/counter-32k.h can't be added due to > ARM CONFIG_ARCH_MULTIPLATFORM restrictions on the use of the "plat/" > include path shortcut. Here it's OK to include <plat/counter-32k.h> for multiplatform builds as the path will be included in plat-omap/Makefile. So include <plat/*.h> will only disappear for drivers. In the long run we should just make the remaining code in plat-omap into drivers, and then issue will disappear for good. But until these are all drivers, we should just include <plat/counter-32k.h>. Regards, Tony
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index f3771cd..1d129d3 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -22,6 +22,8 @@ #include <asm/mach/time.h> #include <asm/sched_clock.h> +#include "counter_32k.h" + /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */ #define OMAP2_32KSYNCNT_REV_OFF 0x0 #define OMAP2_32KSYNCNT_REV_SCHEME (0x3 << 30) diff --git a/arch/arm/plat-omap/counter_32k.h b/arch/arm/plat-omap/counter_32k.h new file mode 100644 index 0000000..4366ce5 --- /dev/null +++ b/arch/arm/plat-omap/counter_32k.h @@ -0,0 +1,20 @@ +/* + * OMAP 32k counter function prototypes + * + * Copyright (C) 2012 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * XXX Needed until the OMAP 32k counter code is moved to somewhere under + * drivers/. + */ +#ifndef __ARCH_ARM_PLAT_OMAP_COUNTER_32K_H +#define __ARCH_ARM_PLAT_OMAP_COUNTER_32K_H + +#include <linux/kernel.h> + +extern int omap_init_clocksource_32k(void __iomem *vbase); + +#endif
Commit 1fe97c8f6a1de67a5f56e029a818903d5bed8017 ("ARM: OMAP: Make OMAP clocksource source selection using kernel param") results in a new warning from sparse: arch/arm/plat-omap/counter_32k.c:86:12: warning: symbol 'omap_init_clocksource_32k' was not declared. Should it be static? Fix by adding a temporary header file, needed until the 32k counter code is moved to drivers/. arch/arm/plat-omap/include/plat/counter-32k.h can't be added due to ARM CONFIG_ARCH_MULTIPLATFORM restrictions on the use of the "plat/" include path shortcut. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Vaibhav Hiremath <hvaibhav@ti.com> Cc: Felipe Balbi <balbi@ti.com> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Cc: Tony Lindgren <tony@atomide.com> --- arch/arm/plat-omap/counter_32k.c | 2 ++ arch/arm/plat-omap/counter_32k.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 arch/arm/plat-omap/counter_32k.h