Re: [PATCH] omap: fix build when MTD_NAND_OMAP2 and TOUCHSCREEN_ADS7846 are disabled

2011-05-06 Thread Tony Lindgren 
* Oleg Drokin gr...@linuxhacker.ru [110504 08:59]:
 Hello!
 
 On May 4, 2011, at 9:27 AM, Mike Rapoport wrote:
 
  Commits 5e6a64b36ce346b7a2d481ef9fa315290eb28e5e (omap: move detection of
  NAND CS to common-board-devices) and 
  96974a249b0cf3537f49115a59be67e2c54f315c
  (omap: consolidate touch screen initialization among different boards)
  break compilation when CONFIG_MTD_NAND_OMAP2 and
  CONFIG_TOUCHSCREEN_ADS7846 are not selected.
  Removing ifdefs and stubs from common-board-devices.h fixes the problem.
 
 Works for me.

We should not build in code unnecessarily unless the boards has
ads7847. Many boards don't have it.

So how about do the ifdef optimization for ads7846_spi_board_info
and omap_ads7846_init in common-board-devices.c?

That keeps the header clean and the we have all the code in one
place in a way where it's optimized out if not selected.

Regards,

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

[PATCH] omap: fix build when MTD_NAND_OMAP2 and TOUCHSCREEN_ADS7846 are disabled

2011-05-04 Thread Mike Rapoport 
Commits 5e6a64b36ce346b7a2d481ef9fa315290eb28e5e (omap: move detection of
NAND CS to common-board-devices) and 96974a249b0cf3537f49115a59be67e2c54f315c
(omap: consolidate touch screen initialization among different boards)
break compilation when CONFIG_MTD_NAND_OMAP2 and
CONFIG_TOUCHSCREEN_ADS7846 are not selected.
Removing ifdefs and stubs from common-board-devices.h fixes the problem.

Signed-off-by: Mike Rapoport m...@compulab.co.il
CC: Oleg Drokin gr...@linuxhacker.ru
---
17 more lines are gone ;-)

 arch/arm/mach-omap2/common-board-devices.h |   17 -
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/arch/arm/mach-omap2/common-board-devices.h 
b/arch/arm/mach-omap2/common-board-devices.h
index ca03abf..eb80b3b 100644
--- a/arch/arm/mach-omap2/common-board-devices.h
+++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -26,27 +26,10 @@ static inline void omap4_pmic_init(const char *pmic_type,
omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data);
 }
 
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
-   defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 struct ads7846_platform_data;
 
 void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
   struct ads7846_platform_data *board_pdata);
-#else
-static inline void omap_ads7846_init(int bus_num,
-int gpio_pendown, int gpio_debounce,
-struct ads7846_platform_data *board_data)
-{
-}
-#endif
-
-#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
 void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
-#else
-static inline void omap_nand_flash_init(int opts, struct mtd_partition *parts,
-   int nr_parts)
-{
-}
-#endif
 
 #endif /* __OMAP_COMMON_BOARD_DEVICES__ */
-- 
1.7.3.1

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

Re: [PATCH] omap: fix build when MTD_NAND_OMAP2 and TOUCHSCREEN_ADS7846 are disabled

2011-05-04 Thread Oleg Drokin 
Hello!

On May 4, 2011, at 9:27 AM, Mike Rapoport wrote:

 Commits 5e6a64b36ce346b7a2d481ef9fa315290eb28e5e (omap: move detection of
 NAND CS to common-board-devices) and 96974a249b0cf3537f49115a59be67e2c54f315c
 (omap: consolidate touch screen initialization among different boards)
 break compilation when CONFIG_MTD_NAND_OMAP2 and
 CONFIG_TOUCHSCREEN_ADS7846 are not selected.
 Removing ifdefs and stubs from common-board-devices.h fixes the problem.

Works for me.

Bye, 
   Oleg

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