Skip to content

Commit

Permalink
ARM: OMAP: remove unused cpu detection macros
Browse files Browse the repository at this point in the history
Now that OMAP730 and OMAP850 support is mostly unified, there's no
need for separate cpu detection macros for these architectures. At
least, currently there isn't, because both macros are unused.
cpu_is_7xx() seems to cover all possible uses.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
[tony@atomide.com: updated to also to remove related IS_OMAP_TYPE]
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Paul Bolle authored and Tony Lindgren committed Jun 28, 2012
1 parent d2ba779 commit 0fb3784
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions arch/arm/plat-omap/include/plat/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,6 @@ IS_AM_SUBCLASS(335x, 0x335)
* Macros to detect individual cpu types.
* These are only rarely needed.
* cpu_is_omap310(): True for OMAP310
* cpu_is_omap730(): True for OMAP730
* cpu_is_omap850(): True for OMAP850
* cpu_is_omap1510(): True for OMAP1510
* cpu_is_omap1610(): True for OMAP1610
* cpu_is_omap1611(): True for OMAP1611
Expand All @@ -264,8 +262,6 @@ static inline int is_omap ##type (void) \
}

IS_OMAP_TYPE(310, 0x0310)
IS_OMAP_TYPE(730, 0x0730)
IS_OMAP_TYPE(850, 0x0850)
IS_OMAP_TYPE(1510, 0x1510)
IS_OMAP_TYPE(1610, 0x1610)
IS_OMAP_TYPE(1611, 0x1611)
Expand All @@ -281,8 +277,6 @@ IS_OMAP_TYPE(3505, 0x3517)
IS_OMAP_TYPE(3517, 0x3517)

#define cpu_is_omap310() 0
#define cpu_is_omap730() 0
#define cpu_is_omap850() 0
#define cpu_is_omap1510() 0
#define cpu_is_omap1610() 0
#define cpu_is_omap5912() 0
Expand All @@ -304,19 +298,9 @@ IS_OMAP_TYPE(3517, 0x3517)

/*
* Whether we have MULTI_OMAP1 or not, we still need to distinguish
* between 730 vs 850, 310 vs. 1510 and 1611B/5912 vs. 1710.
* between 310 vs. 1510 and 1611B/5912 vs. 1710.
*/

#if defined(CONFIG_ARCH_OMAP730)
# undef cpu_is_omap730
# define cpu_is_omap730() is_omap730()
#endif

#if defined(CONFIG_ARCH_OMAP850)
# undef cpu_is_omap850
# define cpu_is_omap850() is_omap850()
#endif

#if defined(CONFIG_ARCH_OMAP15XX)
# undef cpu_is_omap310
# undef cpu_is_omap1510
Expand Down

0 comments on commit 0fb3784

Please sign in to comment.