From patchwork Tue Jul 2 23:09:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 256523 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 509D82C0087 for ; Wed, 3 Jul 2013 09:09:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755521Ab3GBXJj (ORCPT ); Tue, 2 Jul 2013 19:09:39 -0400 Received: from mic92-1-81-57-185-249.fbx.proxad.net ([81.57.185.249]:60605 "EHLO smtp.natisbad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753221Ab3GBXJh (ORCPT ); Tue, 2 Jul 2013 19:09:37 -0400 Received: by smtp.natisbad.org (Postfix, from userid 5001) id AAEA72C0556; Wed, 3 Jul 2013 01:09:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1372806574; bh=Qj5sEy9aPoOIZnWYBNpURQcXYQLJpqvABS8etYT2rcE=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=MGZ85hcsvVR5tC1sVhZLt8lDv9JwRdWOz/lcSLv015OcTtUYquxSP8yrWKyDB3f6G pvaRglIbf8cFY2Rcs2DiHcFDyx4FjSo0Y8avZ0+mBeipiZrDjR4BP6abvycC1rIRGH gGhHs/v7405icz4CQGc8hPKVA4mSH6IEOWnO09O0= X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on petit X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id B74AF2C0244; Wed, 3 Jul 2013 01:09:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1372806559; bh=Qj5sEy9aPoOIZnWYBNpURQcXYQLJpqvABS8etYT2rcE=; h=From:To:Cc:Subject:References:Date:In-Reply-To; b=0deo+ZrujNMNXoYGCnvg4xYr8qdvsPujbw+xnFhN8JxK49L0p+wnZddX+S7h0IYP5 3go+Mefxi9tWAlXJMa6B0aeeaV/835G+gG2AcKl/2rz0ThNmhk6CmCWCCFd9J1tEgD DR/23NvxdZKpldAkNqyR4iVE5bK3KFam5ZowRzx4= From: arno@natisbad.org (Arnaud Ebalard) To: Sebastian Hesselbarth Cc: Thomas Petazzoni , Andrew Lunn , Russell King , Jason Cooper , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 5/7] ARM: kirkwood: remove redundant DT board files References: <1372762824-12202-1-git-send-email-sebastian.hesselbarth@gmail.com> <1372762824-12202-6-git-send-email-sebastian.hesselbarth@gmail.com> X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B X-Hashcash: 1:20:130702:linux-arm-kernel@lists.infradead.org::UcZA9gg84B+jAiCA:00000000000000000000000000bPb X-Hashcash: 1:20:130702:linux-kernel@vger.kernel.org::CpqbPwQEyWwohWPa:0000000000000000000000000000000001VU0 X-Hashcash: 1:20:130702:andrew@lunn.ch::RNBvSz1xEPZEsHFG:0001FJp X-Hashcash: 1:20:130702:thomas.petazzoni@free-electrons.com::6OWm2EOT7QamNhxH:000000000000000000000000001Vbd X-Hashcash: 1:20:130702:netdev@vger.kernel.org::itSLa3JpiSDgN84o:0000000000000000000000000000000000000001jzb X-Hashcash: 1:20:130702:linux@arm.linux.org.uk::Zw/WM1liEciGB21q:0000000000000000000000000000000000000002nCW X-Hashcash: 1:20:130702:jason@lakedaemon.net::O1UpPPJUUEkJLuiI:000000000000000000000000000000000000000004ikL X-Hashcash: 1:20:130702:gregory.clement@free-electrons.com::hxOh9JM7D0OpXmn8:0000000000000000000000000002p33 X-Hashcash: 1:20:130702:sebastian.hesselbarth@gmail.com::ByiXDE3wsgk3hHJT:000000000000000000000000000000AtOv Date: Wed, 03 Jul 2013 01:09:50 +0200 In-Reply-To: <1372762824-12202-6-git-send-email-sebastian.hesselbarth@gmail.com> (Sebastian Hesselbarth's message of "Tue, 2 Jul 2013 13:00:22 +0200") Message-ID: <87k3l8v9s1.fsf@natisbad.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Sebastian, Sebastian Hesselbarth writes: > With DT support for mv643xx_eth board specific init for some boards now > is unneccessary. Remove those board files, Kconfig entries, and > corresponding entries in kirkwood_defconfig. Applying above your set an old quilt cleaning patch Jason asked at some point, it became empty except for arch/arm/mach_kirkwood/common.h in which some declarations were left behind. If this is correct, can you just merge the hunks below in your 5/7 in next round? AFAICT, only dnskw_init() remains, which matches the list of board-*.c files in arch/arm/mach_kirkwood/ (i.e. board-dt.c and board-dnskw.c). Cheers, a+ Signed-off-by: Arnaud Ebalard --- arch/arm/mach-kirkwood/common.h | 108 ---------------------------------------- 1 file changed, 108 deletions(-) diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 1c09f3f..1cbdd2b 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -57,26 +57,6 @@ void kirkwood_restart(char, const char *); void kirkwood_clk_init(void); /* board init functions for boards not fully converted to fdt */ -#ifdef CONFIG_MACH_DREAMPLUG_DT -void dreamplug_init(void); -#else -static inline void dreamplug_init(void) {}; -#endif -#ifdef CONFIG_MACH_GURUPLUG_DT -void guruplug_dt_init(void); -#else -static inline void guruplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_SHEEVAPLUG_DT -void sheevaplug_dt_init(void); -#else -static inline void sheevaplug_dt_init(void) {}; -#endif -#ifdef CONFIG_MACH_TS219_DT -void qnap_dt_ts219_init(void); -#else -static inline void qnap_dt_ts219_init(void) {}; -#endif #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT void dnskw_init(void); @@ -84,94 +64,6 @@ void dnskw_init(void); static inline void dnskw_init(void) {}; #endif -#ifdef CONFIG_MACH_ICONNECT_DT -void iconnect_init(void); -#else -static inline void iconnect_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IB62X0_DT -void ib62x0_init(void); -#else -static inline void ib62x0_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DOCKSTAR_DT -void dockstar_dt_init(void); -#else -static inline void dockstar_dt_init(void) {}; -#endif - -#ifdef CONFIG_MACH_GOFLEXNET_DT -void goflexnet_init(void); -#else -static inline void goflexnet_init(void) {}; -#endif - -#ifdef CONFIG_MACH_LSXL_DT -void lsxl_init(void); -#else -static inline void lsxl_init(void) {}; -#endif - -#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT -void iomega_ix2_200_init(void); -#else -static inline void iomega_ix2_200_init(void) {}; -#endif - -#ifdef CONFIG_MACH_KM_KIRKWOOD_DT -void km_kirkwood_init(void); -#else -static inline void km_kirkwood_init(void) {}; -#endif - -#ifdef CONFIG_MACH_DB88F628X_BP_DT -void db88f628x_init(void); -#else -static inline void db88f628x_init(void) {}; -#endif - -#ifdef CONFIG_MACH_MPLCEC4_DT -void mplcec4_init(void); -#else -static inline void mplcec4_init(void) {}; -#endif - -#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \ - defined(CONFIG_MACH_NETSPACE_MINI_V2_DT) -void ns2_init(void); -#else -static inline void ns2_init(void) {}; -#endif - -#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT -void openblocks_a6_init(void); -#else -static inline void openblocks_a6_init(void) {}; -#endif - -#ifdef CONFIG_MACH_READYNAS_DT -void netgear_readynas_init(void); -#else -static inline void netgear_readynas_init(void) {}; -#endif - -#ifdef CONFIG_MACH_TOPKICK_DT -void usi_topkick_init(void); -#else -static inline void usi_topkick_init(void) {}; -#endif - -#ifdef CONFIG_MACH_CLOUDBOX_DT -void cloudbox_init(void); -#else -static inline void cloudbox_init(void) {}; -#endif - /* early init functions not converted to fdt yet */ char *kirkwood_id(void); void kirkwood_l2_init(void);