change OMAP3_SHOW_FEATURE into OMAP_SHOW_FEATURE to make the usage generic.
Cc: Tony Lindgren <[email protected]> Cc: Angelo Arrifano <[email protected]> Cc: "Zebediah C. McClure" <[email protected]> Cc: Alistair Buxton <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Sanjeev Premi <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: Senthilvadivu Gurusamy <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: Aaro Koskinen <[email protected]> Cc: Vikram Pandita <[email protected]> Cc: Vishwanath S <[email protected]> Cc: [email protected] Signed-off-by: Nishanth Menon <[email protected]> --- arch/arm/mach-omap2/id.c | 16 ++++++---------- arch/arm/plat-omap/include/plat/cpu.h | 6 ++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index c7bf0e1..809e13a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -293,10 +293,6 @@ static void __init omap4_check_revision(void) pr_err("Unknown OMAP4 CPU id\n"); } -#define OMAP3_SHOW_FEATURE(feat) \ - if (omap3_has_ ##feat()) \ - printk(#feat" "); - static void __init omap3_cpuinfo(void) { u8 rev = GET_OMAP_REVISION(); @@ -358,12 +354,12 @@ static void __init omap3_cpuinfo(void) /* Print verbose information */ pr_info("%s ES%s (", cpu_name, cpu_rev); - OMAP3_SHOW_FEATURE(l2cache); - OMAP3_SHOW_FEATURE(iva); - OMAP3_SHOW_FEATURE(sgx); - OMAP3_SHOW_FEATURE(neon); - OMAP3_SHOW_FEATURE(isp); - OMAP3_SHOW_FEATURE(192mhz_clk); + OMAP_SHOW_FEATURE(3, l2cache); + OMAP_SHOW_FEATURE(3, iva); + OMAP_SHOW_FEATURE(3, sgx); + OMAP_SHOW_FEATURE(3, neon); + OMAP_SHOW_FEATURE(3, isp); + OMAP_SHOW_FEATURE(3, 192mhz_clk); printk(")\n"); } diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index c71dbf4..f8ecbc4 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -450,6 +450,12 @@ static inline unsigned int omap##rev##_has_ ##feat(void) \ return omap##rev##_features & OMAP##rev##_HAS_ ##flag; \ } \ +#define OMAP_SHOW_FEATURE(rev, feat) \ +{ \ + if (omap##rev##_has_ ##feat()) \ + printk(#feat" "); \ +} \ + /* * Runtime detection of OMAP3 features */ -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
