diff mbox

[v2] arm: omap2: remove redundant multiplatform checks

Message ID 1459895738-6546-1-git-send-email-jonas.rabenstein@studium.uni-erlangen.de (mailing list archive)
State New, archived
Headers show

Commit Message

Jonas Rabenstein April 5, 2016, 10:35 p.m. UTC 
The directory arch/arm/mach-omap2 is only selected for compilation if
CONFIG_ARCH_OMAP2PLUS is selected. CONFIG_ARCH_OMAP2PLUS itself is a
silent option and all machines selecting this option are multiplatform
devices. As a consequence checks for CONFIG_ARCH_MULTIPLATFORM as well
as CONFIG_ARCH_OMAP2PLUS within that directory are superfluous and can
be removed.

Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
---
changes in v2:
 * missed two #endif's

 arch/arm/mach-omap2/Makefile |   2 +-
 arch/arm/mach-omap2/soc.h    | 121 +++----------------------------------------
 2 files changed, 8 insertions(+), 115 deletions(-)

Comments

kernel test robot April 6, 2016, 12:05 a.m. UTC | #1 
Hi Jonas,

[auto build test ERROR on arm-soc/for-next]
[also build test ERROR on v4.6-rc2 next-20160405]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Jonas-Rabenstein/arm-omap2-remove-redundant-multiplatform-checks/20160406-064050
base:   https://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git for-next
config: arm-multi_v7_defconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   arch/arm/mach-omap2/io.c: In function 'omap_sdrc_init':
>> arch/arm/mach-omap2/io.c:766:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx() || omap3_has_sdrc()) {
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/control.c: In function 'omap_ctrl_write_dsp_boot_addr':
>> arch/arm/mach-omap2/control.c:245:2: error: implicit declaration of function 'soc_is_omap243x' [-Werror=implicit-function-declaration]
     u32 offset = cpu_is_omap243x() ? OMAP243X_CONTROL_IVA2_BOOTADDR :
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/timer.c: In function 'omap_dm_timer_get_errata':
>> arch/arm/mach-omap2/timer.c:223:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx())
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/display.c: In function 'omap_display_get_version':
>> arch/arm/mach-omap2/display.c:265:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx())
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/i2c.c: In function 'omap_i2c_nr_ports':
>> arch/arm/mach-omap2/i2c.c:115:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx())
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/omap_hwmod.c: In function 'omap_hwmod_init':
>> arch/arm/mach-omap2/omap_hwmod.c:3895:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx()) {
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/sram.c: In function 'is_sram_locked':
>> arch/arm/mach-omap2/sram.c:66:3: error: implicit declaration of function 'soc_is_omap242x' [-Werror=implicit-function-declaration]
      if (cpu_is_omap242x()) {
      ^
   arch/arm/mach-omap2/sram.c: In function 'omap_detect_sram':
>> arch/arm/mach-omap2/sram.c:114:4: error: implicit declaration of function 'soc_is_omap243x' [-Werror=implicit-function-declaration]
       else if (cpu_is_omap243x())
       ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/clockdomain.c: In function 'clkdm_hwmod_enable':
>> arch/arm/mach-omap2/clockdomain.c:1233:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx() || cpu_is_omap34xx())
     ^
   cc1: some warnings being treated as errors
--
   arch/arm/mach-omap2/clock.c: In function 'ti_clk_init_features':
>> arch/arm/mach-omap2/clock.c:194:2: error: implicit declaration of function 'soc_is_omap24xx' [-Werror=implicit-function-declaration]
     if (cpu_is_omap24xx()) {
     ^
   cc1: some warnings being treated as errors

vim +/soc_is_omap24xx +766 arch/arm/mach-omap2/io.c

a3a9384a R Sricharan      2013-07-03  760  
a4ca9dbe Tony Lindgren    2011-08-22  761  void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
4805734b Paul Walmsley    2010-12-21  762  				      struct omap_sdrc_params *sdrc_cs1)
4805734b Paul Walmsley    2010-12-21  763  {
a66cb345 Tony Lindgren    2011-10-04  764  	omap_sram_init();
a66cb345 Tony Lindgren    2011-10-04  765  
01001712 Hemant Pedanekar 2011-02-16 @766  	if (cpu_is_omap24xx() || omap3_has_sdrc()) {
58cda884 Jean Pihet       2009-07-24  767  		omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
2f135eaf Paul Walmsley    2009-06-19  768  		_omap2_init_reprogram_sdrc();
aa4b1f6e Kevin Hilman     2010-03-10  769  	}

:::::: The code at line 766 was first introduced by commit
:::::: 01001712c96f82e6317b1e09729d8fc4bcc66957 TI816X: Update common OMAP machine specific sources

:::::: TO: Hemant Pedanekar <hemantp@ti.com>
:::::: CC: Tony Lindgren <tony@atomide.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Lokesh Vutla April 6, 2016, 4:26 a.m. UTC | #2 
On Wednesday 06 April 2016 04:05 AM, Jonas Rabenstein wrote:
> The directory arch/arm/mach-omap2 is only selected for compilation if
> CONFIG_ARCH_OMAP2PLUS is selected. CONFIG_ARCH_OMAP2PLUS itself is a
> silent option and all machines selecting this option are multiplatform
> devices. As a consequence checks for CONFIG_ARCH_MULTIPLATFORM as well
> as CONFIG_ARCH_OMAP2PLUS within that directory are superfluous and can
> be removed.
> 
> Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
> ---
> changes in v2:
>  * missed two #endif's
> 
>  arch/arm/mach-omap2/Makefile |   2 +-
>  arch/arm/mach-omap2/soc.h    | 121 +++----------------------------------------
>  2 files changed, 8 insertions(+), 115 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 0ba6a0e..04e276c 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -2,7 +2,7 @@
>  # Makefile for the linux kernel.
>  #
>  
> -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
> +ccflags-y := -I$(srctree)/$(src)/include \
>  	-I$(srctree)/arch/arm/plat-omap/include
>  
>  # Common support
> diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
> index 364418c..79f1573 100644
> --- a/arch/arm/mach-omap2/soc.h
> +++ b/arch/arm/mach-omap2/soc.h
> @@ -42,79 +42,7 @@
>   * Test if multicore OMAP support is needed
>   */
>  #undef MULTI_OMAP2
> -#undef OMAP_NAME
> -
> -#ifdef CONFIG_ARCH_MULTIPLATFORM
>  #define MULTI_OMAP2
> -#endif
> -#ifdef CONFIG_SOC_OMAP2420
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME omap2420
> -# endif
> -#endif
> -#ifdef CONFIG_SOC_OMAP2430
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME omap2430
> -# endif
> -#endif
> -#ifdef CONFIG_ARCH_OMAP3
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME omap3
> -# endif
> -#endif
> -#ifdef CONFIG_ARCH_OMAP4
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME omap4
> -# endif
> -#endif
> -
> -#ifdef CONFIG_SOC_OMAP5
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME omap5
> -# endif
> -#endif
> -
> -#ifdef CONFIG_SOC_AM33XX
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME am33xx
> -# endif
> -#endif
> -
> -#ifdef CONFIG_SOC_AM43XX
> -# ifdef OMAP_NAME
> -#  undef  MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME am43xx
> -# endif
> -#endif
> -
> -#ifdef CONFIG_SOC_DRA7XX
> -# ifdef OMAP_NAME
> -#  undef MULTI_OMAP2
> -#  define MULTI_OMAP2
> -# else
> -#  define OMAP_NAME DRA7XX
> -# endif
> -#endif
>  
>  /*
>   * Omap device type i.e. EMU/HS/TST/GP/BAD
> @@ -242,11 +170,6 @@ IS_AM_SUBCLASS(437x, 0x437)
>  IS_DRA_SUBCLASS(75x, 0x75)
>  IS_DRA_SUBCLASS(72x, 0x72)
>  
> -#define soc_is_omap24xx()		0
> -#define soc_is_omap242x()		0
> -#define soc_is_omap243x()		0
> -#define soc_is_omap34xx()		0
> -#define soc_is_omap343x()		0

Why are you deleting these definitions. Without these I am sure there
will be a build error when you don't select ARCH_OMAP2 or ARCH_OMAP3 and
building with omap2plus_defconfig.

Thanks and regards,
Lokesh

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 0ba6a0e..04e276c 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -2,7 +2,7 @@ 
 # Makefile for the linux kernel.
 #
 
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
+ccflags-y := -I$(srctree)/$(src)/include \
 	-I$(srctree)/arch/arm/plat-omap/include
 
 # Common support
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 364418c..79f1573 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -42,79 +42,7 @@ 
  * Test if multicore OMAP support is needed
  */
 #undef MULTI_OMAP2
-#undef OMAP_NAME
-
-#ifdef CONFIG_ARCH_MULTIPLATFORM
 #define MULTI_OMAP2
-#endif
-#ifdef CONFIG_SOC_OMAP2420
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap2420
-# endif
-#endif
-#ifdef CONFIG_SOC_OMAP2430
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap2430
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP3
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap3
-# endif
-#endif
-#ifdef CONFIG_ARCH_OMAP4
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap4
-# endif
-#endif
-
-#ifdef CONFIG_SOC_OMAP5
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME omap5
-# endif
-#endif
-
-#ifdef CONFIG_SOC_AM33XX
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME am33xx
-# endif
-#endif
-
-#ifdef CONFIG_SOC_AM43XX
-# ifdef OMAP_NAME
-#  undef  MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME am43xx
-# endif
-#endif
-
-#ifdef CONFIG_SOC_DRA7XX
-# ifdef OMAP_NAME
-#  undef MULTI_OMAP2
-#  define MULTI_OMAP2
-# else
-#  define OMAP_NAME DRA7XX
-# endif
-#endif
 
 /*
  * Omap device type i.e. EMU/HS/TST/GP/BAD
@@ -242,11 +170,6 @@  IS_AM_SUBCLASS(437x, 0x437)
 IS_DRA_SUBCLASS(75x, 0x75)
 IS_DRA_SUBCLASS(72x, 0x72)
 
-#define soc_is_omap24xx()		0
-#define soc_is_omap242x()		0
-#define soc_is_omap243x()		0
-#define soc_is_omap34xx()		0
-#define soc_is_omap343x()		0
 #define soc_is_ti81xx()			0
 #define soc_is_ti816x()			0
 #define soc_is_ti814x()			0
@@ -265,46 +188,18 @@  IS_DRA_SUBCLASS(72x, 0x72)
 #define soc_is_dra74x()			0
 #define soc_is_dra72x()			0
 
-#if defined(MULTI_OMAP2)
-# if defined(CONFIG_ARCH_OMAP2)
-#  undef  soc_is_omap24xx
+#if defined(CONFIG_ARCH_OMAP2)
 #  define soc_is_omap24xx()		is_omap24xx()
-# endif
-# if defined (CONFIG_SOC_OMAP2420)
-#  undef  soc_is_omap242x
+#endif
+#if defined(CONFIG_SOC_OMAP2420)
 #  define soc_is_omap242x()		is_omap242x()
-# endif
-# if defined (CONFIG_SOC_OMAP2430)
-#  undef  soc_is_omap243x
+#endif
+#if defined(CONFIG_SOC_OMAP2430)
 #  define soc_is_omap243x()		is_omap243x()
-# endif
-# if defined(CONFIG_ARCH_OMAP3)
-#  undef  soc_is_omap34xx
-#  undef  soc_is_omap343x
+#endif
+#if defined(CONFIG_ARCH_OMAP3)
 #  define soc_is_omap34xx()		is_omap34xx()
 #  define soc_is_omap343x()		is_omap343x()
-# endif
-#else
-# if defined(CONFIG_ARCH_OMAP2)
-#  undef  soc_is_omap24xx
-#  define soc_is_omap24xx()		1
-# endif
-# if defined(CONFIG_SOC_OMAP2420)
-#  undef  soc_is_omap242x
-#  define soc_is_omap242x()		1
-# endif
-# if defined(CONFIG_SOC_OMAP2430)
-#  undef  soc_is_omap243x
-#  define soc_is_omap243x()		1
-# endif
-# if defined(CONFIG_ARCH_OMAP3)
-#  undef  soc_is_omap34xx
-#  define soc_is_omap34xx()		1
-# endif
-# if defined(CONFIG_SOC_OMAP3430)
-#  undef  soc_is_omap343x
-#  define soc_is_omap343x()		1
-# endif
 #endif
 
 /*
@@ -339,7 +234,6 @@  IS_OMAP_TYPE(3430, 0x3430)
 #define soc_is_omap5430()		0
 
 /* These are needed for the common code */
-#ifdef CONFIG_ARCH_OMAP2PLUS
 #define soc_is_omap7xx()		0
 #define soc_is_omap15xx()		0
 #define soc_is_omap16xx()		0
@@ -350,7 +244,6 @@  IS_OMAP_TYPE(3430, 0x3430)
 #define soc_is_omap1710()		0
 #define cpu_class_is_omap1()		0
 #define cpu_class_is_omap2()		1
-#endif
 
 #if defined(CONFIG_ARCH_OMAP2)
 # undef  soc_is_omap2420