From patchwork Wed Aug 20 13:03:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4751091 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F339C0338 for ; Wed, 20 Aug 2014 13:01:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82BDA2012F for ; Wed, 20 Aug 2014 13:01:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF112200E7 for ; Wed, 20 Aug 2014 13:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753049AbaHTNA7 (ORCPT ); Wed, 20 Aug 2014 09:00:59 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:38002 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbaHTNA7 (ORCPT ); Wed, 20 Aug 2014 09:00:59 -0400 Received: by mail-pd0-f175.google.com with SMTP id r10so11882829pdi.34 for ; Wed, 20 Aug 2014 06:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=zyoz23Vklf4x39mH9QPyAe7wx4bfC8swtpnNRFlYgcE=; b=r1KARgtrgLQhnfvrI8VsbaAHyxlK+Y9TBfV1vu0Mi7JlVrOZ0vU8piH+E2ayTAddMe gW+aFK9zHdo8kQOIyyamy3avWw8Z4hx5HmU9t5ACwNn3+HqcLyF4QxyCrsFDNh0AHify U18FudhL4nWWpMl5OpAixi9egTLp3+rPQTc7h+3w/0iGofqKU+ywJSYUCnjnA8OVQ8LU tFkKBMCis5P06bYr399fXjMQKR8tSBjs+lROQL0lI8QnpT9dWgw6aEFbv7EXDQiD/27j tELXyGWwVJ2/ZZhajHJL0UIoKVJx7eSpD0lUJnVcE/0oWdmFMMQfDiOtNf8Oqbv9+dVD w51w== X-Received: by 10.66.149.102 with SMTP id tz6mr52435485pab.76.1408539655306; Wed, 20 Aug 2014 06:00:55 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id ux10sm80097842pac.10.2014.08.20.06.00.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2014 06:00:54 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , horms@verge.net.au Date: Wed, 20 Aug 2014 22:03:12 +0900 Message-Id: <20140820130312.32075.52599.sendpatchset@w520> In-Reply-To: <20140820130201.32075.45257.sendpatchset@w520> References: <20140820130201.32075.45257.sendpatchset@w520> Subject: [PATCH 08/10] ARM: shmobile: Remove shmobile_setup_delay() 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, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Magnus Damm All ARM mach-shmobile SoCs and boards now rely on DTS for CPU Frequency information, so remove the unused function shmobile_setup_delay(). While at it, make the function shmobile_setup_delay_hz() static. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/common.h | 2 -- arch/arm/mach-shmobile/timer.c | 21 ++------------------- 2 files changed, 2 insertions(+), 21 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/common.h +++ work/arch/arm/mach-shmobile/common.h 2014-08-20 21:21:09.000000000 +0900 @@ -2,8 +2,6 @@ #define __ARCH_MACH_COMMON_H extern void shmobile_earlytimer_init(void); -extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz, - unsigned int mult, unsigned int div); extern void shmobile_init_delay(void); struct twd_local_timer; extern void shmobile_setup_console(void); --- 0001/arch/arm/mach-shmobile/timer.c +++ work/arch/arm/mach-shmobile/timer.c 2014-08-20 21:21:40.000000000 +0900 @@ -23,8 +23,8 @@ #include #include -void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz, - unsigned int mult, unsigned int div) +static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz, + unsigned int mult, unsigned int div) { /* calculate a worst-case loops-per-jiffy value * based on maximum cpu core hz setting and the @@ -40,23 +40,6 @@ void __init shmobile_setup_delay_hz(unsi preset_lpj = max_cpu_core_hz / value; } -void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, - unsigned int mult, unsigned int div) -{ - /* calculate a worst-case loops-per-jiffy value - * based on maximum cpu core mhz setting and the - * __delay() implementation in arch/arm/lib/delay.S - * - * this will result in a longer delay than expected - * when the cpu core runs on lower frequencies. - */ - - unsigned int value = (1000000 * mult) / (HZ * div); - - if (!preset_lpj) - preset_lpj = max_cpu_core_mhz * value; -} - void __init shmobile_init_delay(void) { struct device_node *np, *cpus;