From patchwork Wed Mar 3 12:41:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12114039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E557C433DB for ; Wed, 3 Mar 2021 18:28:57 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 D3FB464EF6 for ; Wed, 3 Mar 2021 18:28:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3FB464EF6 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=klWNt4PmnFGIdF8A1PEdcoEWZWlGLZp+awVoMsdnx4I=; b=CIy/aGWOnfBnTvPpcaDoH3mIGO PY5xxP1SyrsGlwRCnsdHr6opr/ko+um5WVeSUucvsobazhCcIO7VDGO4gs2rGy87rP/F3c9JS0SDl yFbuPjgwhQnb9Clvlw/9PNyi2nnO3yP70Q5NKnJc784Ak5fFLYCYjBoTy0SzdlAPUZZB2PkC+fNeO UgURV8hp4dj2BJWoNrNJOqbcb75Sv8haC+pUjpFf6VSCVlmL2Q5gYVUWrLSgM7fLZiV4rPjFNmVy+ y0eZeHuYnCC7YKg2+C09VXIFtk0MGwThceuChCrRo/E+EncYdcnOorps51L1e2+xJ6e5TxowcxS97 jvHilEpw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHWCT-0060n5-LT; Wed, 03 Mar 2021 18:26:21 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHT0N-005Gyq-Q6 for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 15:01:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=zqNR7N+5z2hV0Uoq3lGK5NEf4YOsGOYOQQ1NQB4FlwU=; b=Edg2enyPyWAXSa8d50YphVY6nI KtCXOuzpbgk3DrAtbgt/9MMD7VsTL2/7lfoRgBwLB2uqG/LMey6RSHeV5KhfD2DRpWbPOfRgC042v ceXjcS9WSWmGyZ7khOx9FQdhYtFIjf4X3fhmSJGX3Q99meBUn1IM8oXP8RCleSIWaruDCWVtmob4P 9kSV7NWbX8ExyLAGQ5j68KwOQ78jBB63jd61HVrBI/JduQLf1Kvv5urIyyWjUd6EADM3w2ad69JA5 cOqjGv61bLY3c2T0JXG1z/OjLm3eu9s+IPJhnOqHa1As6AfWFfhcddbZD6ceACndvIhM0VgNWEIjY ttW28u5A==; Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHQq9-002aQB-2b for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 12:42:59 +0000 Received: by mail-wr1-x429.google.com with SMTP id e10so23274450wro.12 for ; Wed, 03 Mar 2021 04:42:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zqNR7N+5z2hV0Uoq3lGK5NEf4YOsGOYOQQ1NQB4FlwU=; b=UzrpXaMlPmz3Kncidp4nrCMnPu6e3+GECWJR8wQm1GbTyF4URxM8l+sxjNIx1iAX5Z eSLmPxK8tp7m5Xl60+gDQboRH8xsRcnoEn0bTlmilTFiguwZMZeQ83aIxgGzcFAK2k84 TrWLuxGj4LT0a7tMHW66pf0cc66W541/ByBR0X3v87Dk4XH9hEyz5Qqalz5Sei70fpMd 1KYqxS/QNG8VUlORDtAegfoki4UwAHvydf8VgdbmKBNLBmzfX8FkYCdRb9Wp+YB8MVpj aDC26qjose26C+BFh1wtjpOM6pp0JslLAUeKCkeDqSNTreOy10nPsfpWD+u5OBEMvwLv hybA== 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:mime-version :content-transfer-encoding; bh=zqNR7N+5z2hV0Uoq3lGK5NEf4YOsGOYOQQ1NQB4FlwU=; b=EYIuyBGBdlB3JN6jyiLk30eBvn0IrWFvptSGXbNizBPkSWkp8ywZsqg1tdETYsMUKv Qe1+KxxWe/LY0h+PjfFxT01CgQLm37jbpUTwB8aMEdfyZKtYAWDl/3Dz72JQV9rW3clI IPpi5Lr+/5zSK15JNdilzd7kjOHRkLGOZBfAzUXeSm7cmCcraytIL9jrV0yhotyA93cg EFgRJ/JSthpUb8ehHgNg1nErcvFP6S1wUNTka1SKCNtDiIwTaThAyHWCr8bOVeDO4RGV m+LpnSwpjboO8AaLi2dOBzn5wdWew2dPaLnVcBrX/G1w3ZH5chA1sIsbxaVb//R1X65O vW6g== X-Gm-Message-State: AOAM5327Z/bSld58CuQyFUl1eKpu7wigl3RfoYqNjwPtVumBDZ37HchS 6t/hL+GLDWph8AbejijVE9iWPw== X-Google-Smtp-Source: ABdhPJxoB2b/QuRF+x7ADj7SWVizXsw+mJxg6ob4Dxtn4fGaeHg9Yy+hl5NwwiPhrkWA8iudGf8mFA== X-Received: by 2002:a05:6000:2cf:: with SMTP id o15mr26656166wry.184.1614775312791; Wed, 03 Mar 2021 04:41:52 -0800 (PST) Received: from dell.default ([91.110.221.155]) by smtp.gmail.com with ESMTPSA id p6sm18174525wru.2.2021.03.03.04.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 04:41:52 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Subject: [RESEND 1/1] arch: arm: mach-at91: pm: Move prototypes to mutually included header Date: Wed, 3 Mar 2021 12:41:49 +0000 Message-Id: <20210303124149.3149511-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210303_124259_593762_3478F9D8 X-CRM114-Status: GOOD ( 19.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , linux-kernel@vger.kernel.org, Ludovic Desroches , Russell King , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Both the caller and the supplier's source file should have access to the include file containing the prototypes. Fixes the following W=1 kernel build warning(s): drivers/pinctrl/pinctrl-at91.c:1637:6: warning: no previous prototype for ‘at91_pinctrl_gpio_suspend’ [-Wmissing-prototypes] 1637 | void at91_pinctrl_gpio_suspend(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/pinctrl/pinctrl-at91.c:1661:6: warning: no previous prototype for ‘at91_pinctrl_gpio_resume’ [-Wmissing-prototypes] 1661 | void at91_pinctrl_gpio_resume(void) | ^~~~~~~~~~~~~~~~~~~~~~~~ Cc: Russell King Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Signed-off-by: Lee Jones Acked-by: Alexandre Belloni Acked-by: Linus Walleij --- arch/arm/mach-at91/pm.c | 19 ++++++++----------- drivers/pinctrl/pinctrl-at91.c | 2 ++ include/soc/at91/pm.h | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 include/soc/at91/pm.h diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 120f9aa6fff32..90dcdfe3b3d0d 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -17,6 +17,8 @@ #include #include +#include + #include #include #include @@ -25,17 +27,6 @@ #include "generic.h" #include "pm.h" -/* - * FIXME: this is needed to communicate between the pinctrl driver and - * the PM implementation in the machine. Possibly part of the PM - * implementation should be moved down into the pinctrl driver and get - * called as part of the generic suspend/resume path. - */ -#ifdef CONFIG_PINCTRL_AT91 -extern void at91_pinctrl_gpio_suspend(void); -extern void at91_pinctrl_gpio_resume(void); -#endif - struct at91_soc_pm { int (*config_shdwc_ws)(void __iomem *shdwc, u32 *mode, u32 *polarity); int (*config_pmc_ws)(void __iomem *pmc, u32 mode, u32 polarity); @@ -326,6 +317,12 @@ static void at91_pm_suspend(suspend_state_t state) static int at91_pm_enter(suspend_state_t state) { #ifdef CONFIG_PINCTRL_AT91 + /* + * FIXME: this is needed to communicate between the pinctrl driver and + * the PM implementation in the machine. Possibly part of the PM + * implementation should be moved down into the pinctrl driver and get + * called as part of the generic suspend/resume path. + */ at91_pinctrl_gpio_suspend(); #endif diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 8003d1bd16953..fc61aaec34cc9 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -23,6 +23,8 @@ /* Since we request GPIOs from ourself */ #include +#include + #include "pinctrl-at91.h" #include "core.h" diff --git a/include/soc/at91/pm.h b/include/soc/at91/pm.h new file mode 100644 index 0000000000000..7a41e53a3ffa3 --- /dev/null +++ b/include/soc/at91/pm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Atmel Power Management + * + * Copyright (C) 2020 Atmel + * + * Author: Lee Jones + */ + +#ifndef __SOC_ATMEL_PM_H +#define __SOC_ATMEL_PM_H + +void at91_pinctrl_gpio_suspend(void); +void at91_pinctrl_gpio_resume(void); + +#endif /* __SOC_ATMEL_PM_H */