From patchwork Fri May 16 12:10:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 4190351 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C82869F1C0 for ; Fri, 16 May 2014 12:10:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07C7C2026F for ; Fri, 16 May 2014 12:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13843202EB for ; Fri, 16 May 2014 12:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756430AbaEPMKd (ORCPT ); Fri, 16 May 2014 08:10:33 -0400 Received: from sauhun.de ([89.238.76.85]:57927 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755220AbaEPMKc (ORCPT ); Fri, 16 May 2014 08:10:32 -0400 Received: from p4fe241dc.dip0.t-ipconnect.de ([79.226.65.220]:47948 helo=localhost) by pokefinder.org with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WlGy7-0008OE-2t; Fri, 16 May 2014 14:10:31 +0200 From: Wolfram Sang To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Wolfram Sang , Magnus Damm , Simon Horman , Laurent Pinchart , Geert Uytterhoeven Subject: [PATCH 2/5] ARM: shmobile: genmai-reference: Remove legacy clock support Date: Fri, 16 May 2014 14:10:13 +0200 Message-Id: <1400242216-20848-3-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400242216-20848-1-git-send-email-wsa@the-dreams.de> References: <1400242216-20848-1-git-send-email-wsa@the-dreams.de> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wolfram Sang genmai-reference is now only built for multiplatform which means that CCF comes with the package. Remove unused legacy code ifdefs to clean up the code. Signed-off-by: Wolfram Sang --- arch/arm/mach-shmobile/board-genmai-reference.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c index 33015e5ed52a..968bbba20d08 100644 --- a/arch/arm/mach-shmobile/board-genmai-reference.c +++ b/arch/arm/mach-shmobile/board-genmai-reference.c @@ -26,7 +26,6 @@ #include #include -#ifdef CONFIG_COMMON_CLK /* * This is a really crude hack to provide clkdev support to platform * devices until they get moved to DT. @@ -34,15 +33,10 @@ static const struct clk_name clk_names[] = { { "mtu2", "fck", "sh-mtu2" }, }; -#endif static void __init genmai_add_standard_devices(void) { -#ifdef CONFIG_COMMON_CLK shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true); -#else - r7s72100_clock_init(); -#endif r7s72100_add_dt_devices(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); }