From patchwork Tue Jul 14 14:50:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11663049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 547FC1392 for ; Tue, 14 Jul 2020 14:54:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2935F21973 for ; Tue, 14 Jul 2020 14:54:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j/8xSC+l"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Yr1SJcM2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2935F21973 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=P+S7kSkYk1LOUEDqATorED5Whm3l4GJW6OyjQILg2P4=; b=j/8xSC+l9mA422sY0fptdu8Dk LfHSYMO8yUzDPzltgPt36IkBG/fpPNIL277omWxMQ1fhBEWm42pPohl7fv54immwaCWcp6oGZuoMQ sdCh4ch0ZWh7bRQmszhAFnZqh5eX9h8KTqbKr/akM4OaU3eqGcbbgWpKnUAzlc4cwMH7jcr+fhRX2 RfoXehLhwyKpnBK3hojqHotQg2DzMziEiEFB183yC/7etrU3vucK58yRpP+hqd0EyaZXgm6W7tA79 Bj5jQB4tpJp5ZDKXbkwiefchYhRXhuhO061wIgVbDUmnA+5mDGO7VlHHdPEsqkz/68TGF3xlEWxo/ 5e90Re3Sw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvMHL-0004dW-Md; Tue, 14 Jul 2020 14:51:31 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvMGo-0004Rf-GD for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2020 14:51:00 +0000 Received: by mail-wr1-x442.google.com with SMTP id f7so22196869wrw.1 for ; Tue, 14 Jul 2020 07:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sa7IFFvEjkUEYkKGNfZ4AaOfAhDNPotc0mtcZbr7pMU=; b=Yr1SJcM2AwK2hW8wKdiFtlaK6rKbZ3NlkGx8d1Od6cqVH4nDmmoGCDQVhLHIDws+3d 2OVvC3aJXzU/ZjRq+haMRmCsqS9W94aOftUL13uUTXk4ZnJIiwTbqrjSFcSQ6+MBToTA Wlf9HuAi0Aza+9dtw/LHZF7rOTCDvLKrgawrfm5e6w/OV2eflKYPT6fW2ypIM7ewVmNc 6sZcE8UtKJDkeu8wqVxcoXJajhBkeReoa/7FhnEB2BS2H5Z5vYRvhfarz4C2XXTsWwBv aBmWOuw/i4Vdi3oCKJV1Zdhv/857tPWI3NzjMDJuHyaPTGpybciaeB3NKBD0sTczkWGs so9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sa7IFFvEjkUEYkKGNfZ4AaOfAhDNPotc0mtcZbr7pMU=; b=Zx/j9KHUmVD2wu9s1Fn9vimXFgsX43jHWmQtOe8AVDE/iHJJ+2TOcwpDYQb2xQwDK2 C0eIL0z8iF5iqyuwSzE4vW8O+xkfLXflgxSlczfdBDwcDVtycyb33Jlr8TnRnXbpp6q5 ENiy7ds+T6n1ztmnB6Epils2c2zGmuNcq18t7GveVWUlbNA64qwh58NJQ/nQvbr/VF+X hnlbzXNzcYaR1lJVbw0tMgr/noFPrASJVuCzMKPTdEkQwqP3nqRQWsossPRDUGif9CdP gHWLoaetACe5q7k5p+1YT0DOC4EXPXgVQm+zzuX9i3rBCKQuCgIanMRpgomIfara0gnV S/pA== X-Gm-Message-State: AOAM533fJI7yBZIGRmuQaxuKc49SwmO+VAsrNsXHOekDgvG6HTmbE6Jc cPTPtYILyLTysm8mi1UJqr7eMg== X-Google-Smtp-Source: ABdhPJzNf9Z+WHkT0D9c7/YKzZVAjpjagqUFxoxaf/blhTxuH25LgfvUKpph8N2tIaWR9WV7qZZ8hg== X-Received: by 2002:adf:82f5:: with SMTP id 108mr6084464wrc.218.1594738257584; Tue, 14 Jul 2020 07:50:57 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.61]) by smtp.gmail.com with ESMTPSA id a84sm4653305wmh.47.2020.07.14.07.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 07:50:57 -0700 (PDT) From: Lee Jones To: rjw@rjwysocki.net, viresh.kumar@linaro.org Subject: [PATCH 05/13] cpufreq/arch: powerpc: pasemi: Move prototypes to shared header Date: Tue, 14 Jul 2020 15:50:41 +0100 Message-Id: <20200714145049.2496163-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714145049.2496163-1-lee.jones@linaro.org> References: <20200714145049.2496163-1-lee.jones@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_105058_640239_4A03CBFC X-CRM114-Status: GOOD ( 18.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pm@vger.kernel.org, Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Paul Mackerras , Benjamin Herrenschmidt , Olof Johansson , Lee Jones , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If function callers and providers do not share the same prototypes the compiler complains of missing prototypes. Fix this by moving the already existing prototypes out to a mutually convenient location. Fixes the following W=1 kernel build warning(s): drivers/cpufreq/pasemi-cpufreq.c:109:5: warning: no previous prototype for ‘check_astate’ [-Wmissing-prototypes] 109 | int check_astate(void) | ^~~~~~~~~~~~ drivers/cpufreq/pasemi-cpufreq.c:114:6: warning: no previous prototype for ‘restore_astate’ [-Wmissing-prototypes] 114 | void restore_astate(int cpu) | ^~~~~~~~~~~~~~ Cc: Olof Johansson Cc: Michael Ellerman Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Lee Jones --- arch/powerpc/platforms/pasemi/pasemi.h | 15 ------------ arch/powerpc/platforms/pasemi/powersave.S | 2 ++ drivers/cpufreq/pasemi-cpufreq.c | 1 + include/linux/platform_data/pasemi.h | 28 +++++++++++++++++++++++ 4 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 include/linux/platform_data/pasemi.h diff --git a/arch/powerpc/platforms/pasemi/pasemi.h b/arch/powerpc/platforms/pasemi/pasemi.h index 70b56048ed1be..528d81ef748ad 100644 --- a/arch/powerpc/platforms/pasemi/pasemi.h +++ b/arch/powerpc/platforms/pasemi/pasemi.h @@ -15,21 +15,6 @@ extern void __init pasemi_map_registers(void); extern void idle_spin(void); extern void idle_doze(void); -/* Restore astate to last set */ -#ifdef CONFIG_PPC_PASEMI_CPUFREQ -extern int check_astate(void); -extern void restore_astate(int cpu); -#else -static inline int check_astate(void) -{ - /* Always return >0 so we never power save */ - return 1; -} -static inline void restore_astate(int cpu) -{ -} -#endif - extern struct pci_controller_ops pasemi_pci_controller_ops; #endif /* _PASEMI_PASEMI_H */ diff --git a/arch/powerpc/platforms/pasemi/powersave.S b/arch/powerpc/platforms/pasemi/powersave.S index d0215d5329ca7..7747b48963286 100644 --- a/arch/powerpc/platforms/pasemi/powersave.S +++ b/arch/powerpc/platforms/pasemi/powersave.S @@ -5,6 +5,8 @@ * Maintained by: Olof Johansson */ +#include + #include #include #include diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c index c66f566a854cb..c6bb3ecc90ef3 100644 --- a/drivers/cpufreq/pasemi-cpufreq.c +++ b/drivers/cpufreq/pasemi-cpufreq.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/include/linux/platform_data/pasemi.h b/include/linux/platform_data/pasemi.h new file mode 100644 index 0000000000000..3fed0687fcc9a --- /dev/null +++ b/include/linux/platform_data/pasemi.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2020 Linaro Ltd. + * + * Author: Lee Jones + */ + +#ifndef _LINUX_PLATFORM_DATA_PASEMI_H +#define _LINUX_PLATFORM_DATA_PASEMI_H + +/* Restore astate to last set */ +#ifdef CONFIG_PPC_PASEMI_CPUFREQ +int check_astate(void); +void restore_astate(int cpu); +#else +static inline int check_astate(void) +{ + /* Always return >0 so we never power save */ + return 1; +} +static inline void restore_astate(int cpu) +{ +} +#endif + +#endif /* _LINUX_PLATFORM_DATA_PASEMI_H */ + +