arm: mach-omap2: remove NULL board_mux from board files
Subsystems (3)
PATCH v3 1/1 arm: mach-omap2: remove NULL board_mux from board files
If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header file instead of forcing every single board to define it.
Signed-off-by Aaro Koskinen <[email protected]>
---
v3: Use __maybe_unused instead of compiler-specific attribute.
v2: Use a static variable to avoid namespace pollution.
arch/arm/mach-omap2/board-2430sdp.c | 2 -- arch/arm/mach-omap2/board-3430sdp.c | 2 -- arch/arm/mach-omap2/board-3630sdp.c | 2 -- arch/arm/mach-omap2/board-am3517evm.c | 2 -- arch/arm/mach-omap2/board-apollon.c | 2 -- arch/arm/mach-omap2/board-h4.c | 2 -- arch/arm/mach-omap2/board-igep0020.c | 2 -- arch/arm/mach-omap2/board-igep0030.c | 2 -- arch/arm/mach-omap2/board-ldp.c | 2 -- arch/arm/mach-omap2/board-n8x0.c | 2 -- arch/arm/mach-omap2/board-omap3beagle.c | 2 -- arch/arm/mach-omap2/board-omap3evm.c | 2 -- arch/arm/mach-omap2/board-omap3logic.c | 2 -- arch/arm/mach-omap2/board-omap3pandora.c | 2 -- arch/arm/mach-omap2/board-omap3stalker.c | 2 -- arch/arm/mach-omap2/board-omap3touchbook.c | 2 -- arch/arm/mach-omap2/board-overo.c | 2 -- arch/arm/mach-omap2/board-rx51.c | 2 -- arch/arm/mach-omap2/board-zoom2.c | 2 -- arch/arm/mach-omap2/board-zoom3.c | 2 -- arch/arm/mach-omap2/mux.h | 2 ++ 21 files changed, 2 insertions(+), 40 deletions(-)
arch/arm/mach-omap2/board-2430sdp.c +0 -2
@@ -218,8 +218,6 @@ static struct omap_usb_config sdp2430_usb_config __initdata = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init omap_2430sdp_init (void )
arch/arm/mach-omap2/board-3430sdp.c +0 -2
@@ -663,8 +663,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif /*
arch/arm/mach-omap2/board-3630sdp.c +0 -2
@@ -83,8 +83,6 @@ static void __init omap_sdp_init_irq(void)static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif /*
arch/arm/mach-omap2/board-am3517evm.c +0 -2
@@ -442,8 +442,6 @@ static struct omap_board_mux board_mux[] __initdata = {OMAP3_MUX (SAD2D_MCAD23 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT_PULLDOWN ), { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif
arch/arm/mach-omap2/board-apollon.c +0 -2
@@ -314,8 +314,6 @@ static void __init apollon_usb_init(void)static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init omap_apollon_init (void )
arch/arm/mach-omap2/board-h4.c +0 -2
@@ -321,8 +321,6 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init omap_h4_init (void )
arch/arm/mach-omap2/board-igep0020.c +0 -2
@@ -577,8 +577,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif #if defined(CONFIG_LIBERTAS_SDIO ) || defined(CONFIG_LIBERTAS_SDIO_MODULE )
arch/arm/mach-omap2/board-igep0030.c +0 -2
@@ -366,8 +366,6 @@ void __init igep3_wifi_bt_init(void) {}static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init igep3_init (void )
arch/arm/mach-omap2/board-ldp.c +0 -2
@@ -381,8 +381,6 @@ static struct platform_device *ldp_devices[] __initdata = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-n8x0.c +0 -2
@@ -653,8 +653,6 @@ static struct omap_board_mux board_mux[] __initdata = {OMAP2420_MUX (EAC_AC_DOUT ,OMAP_MUX_MODE1 |OMAP_PIN_OUTPUT ), { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init n8x0_init_machine (void )
arch/arm/mach-omap2/board-omap3beagle.c +0 -2
@@ -548,8 +548,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-omap3evm.c +0 -2
@@ -654,8 +654,6 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW), { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-omap3logic.c +0 -2
@@ -206,8 +206,6 @@ static void __init omap3logic_init_irq(void)static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init omap3logic_init (void )
arch/arm/mach-omap2/board-omap3pandora.c +0 -2
@@ -711,8 +711,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-omap3stalker.c +0 -2
@@ -616,8 +616,6 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), {.reg_offset = OMAP_MUX_TERMINATOR}, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-omap3touchbook.c +0 -2
@@ -413,8 +413,6 @@ static struct omap_board_config_kernel omap3_touchbook_config[] __initdata = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static void __init omap3_touchbook_init_irq (void )
arch/arm/mach-omap2/board-overo.c +0 -2
@@ -438,8 +438,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-rx51.c +0 -2
@@ -117,8 +117,6 @@ extern void __init rx51_peripherals_init(void);static struct omap_board_mux board_mux[]__initdata = { { .reg_offset =OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct omap_musb_board_data musb_board_data = {
arch/arm/mach-omap2/board-zoom2.c +0 -2
@@ -53,8 +53,6 @@ static struct omap_board_mux board_mux[] __initdata = {OMAP3_MUX (ETK_D6 ,OMAP_MUX_MODE2 |OMAP_PIN_INPUT_PULLUP ), { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static struct mtd_partition zoom_nand_partitions[] = {
arch/arm/mach-omap2/board-zoom3.c +0 -2
@@ -97,8 +97,6 @@ static struct omap_board_mux board_mux[] __initdata = {OMAP3_MUX (ETK_D6 ,OMAP_MUX_MODE2 |OMAP_PIN_INPUT_PULLUP ), { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL#endif static const struct ehci_hcd_omap_platform_data ehci_pdata__initconst = {
arch/arm/mach-omap2/mux.h +2 -0
@@ -133,6 +133,8 @@ static inline int omap_mux_init_signal(char *muxname, int val) return 0; } +static struct omap_board_mux *board_mux__initdata __maybe_unused ; +#endif /**
Signature · 1 line
1.5.6.5
Tony Lindgren
maintainerPATCH v3 1/1 arm: mach-omap2: remove NULL board_mux from board files
Quoted 2 lines · Aaro Koskinen
If
CONFIG_OMAP_MUXis not enabled, we can defineboard_muxin the header file instead of forcing every single board to define it.
Thanks, queueing for the next merge window.
Tony