From patchwork Fri Oct 18 15:41:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176877 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1032178ill; Fri, 18 Oct 2019 08:44:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9cQPKBsQxa9VQkNO+7srHK0G55j5ZKFzIUn13De41M5WU9+Iktfhewm4v5jd8mcTDymg2 X-Received: by 2002:a17:906:1fc8:: with SMTP id e8mr9354012ejt.86.1571413461325; Fri, 18 Oct 2019 08:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571413461; cv=none; d=google.com; s=arc-20160816; b=blfBi/t0tZD0kRY2tbRDMus4X3X83aQ6Qc0DbnS31qdp2fgqlsE4wUFYLqB90qC6K2 YJsFF3oZ3KcJ0QiPid7q7nZA6gVutUWD0AA+j+w4r6dYjjdNqpNWvyqILzYijEEU9Osx 4eLcSYTU3U0qjHFIw+kaDwuEOr1CZEztoBP2RXE5U7P0kQGUmfZa9zF92CNYEBiDLoH6 kcDilMwSCv+mtPlDcVTm2eTgUmbNJm2Cou9iJ0oihifDeMFmSY630+ThcxsjdO0EBZQ+ bRDVIXoDqD299EdwnGdUxLh1qsMuzyXaG7ycDmNpefYm9LZEKt9QgU317JRZko3452Gl 6I5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BI3RlCkphMu98LUhkFBqinLvdrWlMTLwyfywYblxDVs=; b=WuGWkDIfsCqQlOUk+Zr3cK01Sr4GZtMzRct2Qum8ZHrF1JS9NFpAAnMx0N9uVIBcF5 I0vzR3yNXadlQYOED6dPPM7o9UBS3v4HWM/6FQtM8mdaXePEVd+WZgVPrZ/snrght1wH Xtzd6WWJa5KxRWrXHUJQ0GtvEc5nr493fzGAdNKbdqlAUghrTmoSdTSUyue6PyGbmomN M4OzmLBsUEnbBtHSgm7g2bjoX0iSBKgJvMHjXkv2J1pae59pZoivXW8FGsQFzxPxfkBb qt6K987d/jomWnIzPv2zSDLawpikdVOd0HRUpXt0sjOfa8qZG4OzfWQCSMw5/kje/0aX vwyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x8si3703694ejs.414.2019.10.18.08.44.21; Fri, 18 Oct 2019 08:44:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505460AbfJRPoR (ORCPT + 26 others); Fri, 18 Oct 2019 11:44:17 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:53243 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2505177AbfJRPmm (ORCPT ); Fri, 18 Oct 2019 11:42:42 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MLi0U-1id1FP1lhY-00Hit3; Fri, 18 Oct 2019 17:42:31 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann , "Rafael J. Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Subject: [PATCH 34/46] ARM: pxa: remove get_clk_frequency_khz() Date: Fri, 18 Oct 2019 17:41:49 +0200 Message-Id: <20191018154201.1276638-34-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018154052.1276506-1-arnd@arndb.de> References: <20191018154052.1276506-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:ajv1C8WSwVVJwqubsC2bt5cO+b8wc4Y8xW9NXo4JVw9G1bsGrT2 3+AXPyCmUhlneskgIxrP1/FVZhhyJDOeFVaZ7tzYj8Hstb5oJOuFDu2lJHTSf9417rg3p/w dIFCsdSou6O+Hmb7sa7EpVsP80GbrRnJTs+05l0OqYOo5OVAJHAtzYFZhOqsCeEISOScGj+ DRePXvk5skmsTagbj3WvQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:oBYQDQ5NikY=:1/p81ZtOp5BNF6NbpXcMrB WDiVRh3sMMuxA/8SaPXIMXYcTsSq2RSlU2NEnaJ1oBFcd1Kdr67kGzkTw9DtdSOLm9EU8T00N yNy4vDnSgAYf+Nst43jK8b5rcNPYrcLor1InPRd2v7LhQGd5tJJ7H5wXWKerdgr1DVIlcgEs5 bcL78VQJdz8tgjyvc6Ip3wcCDqCqpZwsgf8Xb0K6NhE90J/nbilMhQrwR5c6U8y7z8UmEwCkY ysXqGzk1UhoCWNI2A988VVCZD5+wYCsOtBBd7DURKWgxjGu/qzgHJvjtN+wmvSSEZwvaPS+8R U2DkOy1Z6Z3FDo25RPeY90GmA5hzki5tadDZJ1dNOv/eab1eXMO+PNpYq9mlxKsB+Rr9AwzeT HVPaKTfCjgoUzN4Y/VBkzwH9vY6phomuVhXWpQP/KiIE9ASCLOwttKYAzmWl+7qrl7ob/avRB ub+NBSNFnvvIb0xaKQzbeE+qmmNiY8SVsY7jL7yxy6ejjFY9XCXWsmum2JunQSJdHAt80IzPB OCkfxGEGS2GwuvYQETR/3q01z0XNEN58i8olEcBMv5LunSB4SQqxDdwIS7aIMnO1LW6H/VOTz Q+/RDlrQZKJrnciw9X9jrC+hKgtL5b6XvbOh/UjzpDx9k6QhrzDNwWQ+hFmkcBBxF8ZK06ONh ascEnK0BRqWh39rYwTTJtjzKxuTnkz271NnQ4jv4lcVIEFxsYh18JX8Q34HA6dexcVaMPz9XQ Q7mydkeSFHx73dDypsCDoYuNK5BAQqqlB8Yc2QbiPnf6bYCItRy/AAyQmVkJAy/LvEaaBMq78 AMuJ8SOiCx1+qzUszz5qFdEKhDQuvw2nCA/Bx6f9eo4MLvxXEb4v04OOXVGzi97Ru5/aPmkGF nyCg7GZL1rlZxn1uPhuQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org get_clk_frequency_khz() is not a proper name for a global function, and there is only one caller. Convert viper to use the properly namespaced pxa25x_get_clk_frequency_khz() and remove the other references. Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: linux-pm@vger.kernel.org Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/generic.c | 15 --------------- arch/arm/mach-pxa/generic.h | 1 - arch/arm/mach-pxa/viper.c | 2 +- drivers/cpufreq/pxa2xx-cpufreq.c | 2 -- 4 files changed, 1 insertion(+), 19 deletions(-) -- 2.20.0 diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index fe1d55d328e5..2c2c82fcf9cb 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -55,21 +55,6 @@ void __init pxa_timer_init(void) pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000)); } -/* - * Get the clock frequency as reflected by CCCR and the turbo flag. - * We assume these values have been applied via a fcs. - * If info is not 0 we also display the current settings. - */ -unsigned int get_clk_frequency_khz(int info) -{ - if (cpu_is_pxa25x()) - return pxa25x_get_clk_frequency_khz(info); - else if (cpu_is_pxa27x()) - return pxa27x_get_clk_frequency_khz(info); - return 0; -} -EXPORT_SYMBOL(get_clk_frequency_khz); - void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio) { __raw_writel(mcmem, MCMEM(sock)); diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index 67925d3ea026..2f706ef97357 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -11,7 +11,6 @@ struct irq_data; -extern unsigned int get_clk_frequency_khz(int info); extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *, unsigned int)); extern void __init pxa_map_io(void); diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index fe74ee266871..e341e26f7e2a 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c @@ -852,7 +852,7 @@ static void __init viper_init_vcore_gpios(void) goto err_dir; /* c/should assume redboot set the correct level ??? */ - viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1); + viper_set_core_cpu_voltage(pxa25x_get_clk_frequency_khz(0), 1); return; diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c index 0f0e676ff781..e74d36d6f78d 100644 --- a/drivers/cpufreq/pxa2xx-cpufreq.c +++ b/drivers/cpufreq/pxa2xx-cpufreq.c @@ -107,8 +107,6 @@ static struct pxa_freqs pxa27x_freqs[] = { static struct cpufreq_frequency_table pxa27x_freq_table[NUM_PXA27x_FREQS+1]; -extern unsigned get_clk_frequency_khz(int info); - #ifdef CONFIG_REGULATOR static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)