From patchwork Thu Dec 2 15:51:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Koskinen, Aaro (Nokia - FI/Espoo)" X-Patchwork-Id: 374901 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB2ForkQ030943 for ; Thu, 2 Dec 2010 15:50:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755722Ab0LBPuu (ORCPT ); Thu, 2 Dec 2010 10:50:50 -0500 Received: from smtp.nokia.com ([147.243.128.24]:43342 "EHLO mgw-da01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754668Ab0LBPus (ORCPT ); Thu, 2 Dec 2010 10:50:48 -0500 Received: from localhost.localdomain (corebot.research.nokia.com [172.21.34.37]) by mgw-da01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id oB2FogoK012863; Thu, 2 Dec 2010 17:50:44 +0200 From: Aaro Koskinen To: tony@atomide.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] arm: mach-omap2: rx51: clean up dummy onenand init Date: Thu, 2 Dec 2010 17:51:24 +0200 Message-Id: <1291305084-9159-2-git-send-email-aaro.koskinen@nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1291305084-9159-1-git-send-email-aaro.koskinen@nokia.com> References: <1291305084-9159-1-git-send-email-aaro.koskinen@nokia.com> X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 02 Dec 2010 15:50:55 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 3fec4d6..14a6fbd 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -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();