arm: mach-omap2: n8x0: clean up dummy onenand init
Subsystems (3)
PATCH 1/2 arm: mach-omap2: n8x0: clean up dummy onenand init
When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers.
--- arch/arm/mach-omap2/board-n8x0.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-)
arch/arm/mach-omap2/board-n8x0.c +9 -17
@@ -184,23 +184,15 @@ static struct mtd_partition onenand_partitions[] = { }, }; -static struct omap_onenand_platform_data board_onenand_data = { - .cs =0 , - .gpio_irq =26 , - .parts = onenand_partitions, - .nr_parts =ARRAY_SIZE (onenand_partitions), - .flags =ONENAND_SYNC_READ , +static struct omap_onenand_platform_data board_onenand_data[] = { + { + .cs =0 , + .gpio_irq =26 , + .parts = onenand_partitions, + .nr_parts =ARRAY_SIZE (onenand_partitions), + .flags =ONENAND_SYNC_READ , + } }; - -static void __init n8x0_onenand_init (void ) -{ -gpmc_onenand_init (&board_onenand_data); -} - -#else - -static void __init n8x0_onenand_init (void ) {} -#endif #if defined(CONFIG_MENELAUS) && \
@@ -669,7 +661,7 @@ static void __init n8x0_init_machine(void) ARRAY_SIZE(n810_i2c_board_info_2));omap_serial_init (); -n8x0_onenand_init (); +gpmc_onenand_init (board_onenand_data);n8x0_mmc_init ();n8x0_usb_init (); }
Signature · 1 line
1.5.6.5
PATCH 2/2 arm: mach-omap2: rx51: clean up dummy onenand init
When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers.
--- arch/arm/mach-omap2/board-rx51-peripherals.c | 28 ++++++++----------------- 1 files changed, 9 insertions(+), 19 deletions(-)
arch/arm/mach-omap2/board-rx51-peripherals.c +9 -19
@@ -815,25 +815,15 @@ static struct mtd_partition onenand_partitions[] = { }, }; -static struct omap_onenand_platform_data board_onenand_data = { - .cs =0 , - .gpio_irq =65 , - .parts = onenand_partitions, - .nr_parts =ARRAY_SIZE (onenand_partitions), - .flags =ONENAND_SYNC_READWRITE , +static struct omap_onenand_platform_data board_onenand_data[] = { + { + .cs =0 , + .gpio_irq =65 , + .parts = onenand_partitions, + .nr_parts =ARRAY_SIZE (onenand_partitions), + .flags =ONENAND_SYNC_READWRITE , + } }; - -static void __init board_onenand_init (void ) -{ -gpmc_onenand_init (&board_onenand_data); -} - -#else - -static inline void board_onenand_init (void ) -{ -} -#endif #if defined(CONFIG_SMC91X ) || defined(CONFIG_SMC91X_MODULE )
@@ -916,7 +906,7 @@ error:void __init rx51_peripherals_init (void ) {rx51_i2c_init (); -board_onenand_init (); +gpmc_onenand_init (board_onenand_data);board_smc91x_init ();rx51_add_gpio_keys ();rx51_init_wl1251 ();
Signature · 1 line
1.5.6.5
Tony Lindgren
maintainerPATCH 1/2 arm: mach-omap2: n8x0: clean up dummy onenand init
In reply to Aaro KoskinenQuoted 3 lines · Aaro Koskinen
When OneNAND support is disabled, the platform code defines NULL
board_onenand_dataand empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers.
Applying these too.
Tony