From patchwork Mon Jul 13 14:49:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 235432 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2906106ilg; Mon, 13 Jul 2020 07:49:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTAwoLQR+VMyW2ABCu9lbhRXS4SfzYrBWoLMxEYVvdO3CTXRQuJkl1egJFdQCx44xmxUyO X-Received: by 2002:a50:9f22:: with SMTP id b31mr93528927edf.24.1594651795412; Mon, 13 Jul 2020 07:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594651795; cv=none; d=google.com; s=arc-20160816; b=EFBBilr/rodvhI/bxXflu2ibo0uzbnenN9a+URrrbp/ljDjQy6zgXPWZ/IakblbJLO UdYxherPubJbTw5AhWtnlq76ZfluAgpOKJxPjRgshrVizHmDBNpQSehMqlCUxgvtANlu JAP1uUyVYBJJ54oPvgmOX+OzoBoX2IWN7zrKeMHOnZUwr3Y0dKDtXiLTicQbNgHStkKV c9rpihSs7bptq6PEv0Xj4Y4zdue7qxAhgELs1a3AYLkx9CVa6rshqHqAhiIdrCv1iAZW XWUae5fDrXhurZis8602snNLJEGleXZgIfY/TWSRaHa/h3wO+irbzuxzZ8LqktCeHJCD c4TA== 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 :dkim-signature; bh=8XFfrtDb0YISFxdApa9cgcznz1fKsVfnxLcnox2gJ38=; b=INeDOvurboJUN8OXINbAjNGw88+g4Ve7bem6Qz3dRKeIBNsM04r4r/P+94yL4bJOt2 w/LKnJM3EksX5hT95Rmpe8X9wCrPdWL8LBBQfDvyNXuhon3Iep+M+SUE9y9j2yS5PePr +JoW+MK74FfrXdUW/oixbeDMXP9hxothWjZXeCCusrV54khkB65zSpcS/RufYFAr/t+w Zfi6FTat2/ZEgbVhoYfju8AE9MP/vaWnn/SyTJUEJTI+mh6kHRog1CZAb8YLB8eFzpr4 W15pTF4Llb4Huoaro1H8KM2CWddiIwNgQj21TH0Mo6PyYnLr/YTYPwkaiHG8gLFxP4IF lbXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bY+eI2Sa; spf=pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l11si9337592edq.493.2020.07.13.07.49.55; Mon, 13 Jul 2020 07:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bY+eI2Sa; spf=pass (google.com: domain of linux-gpio-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730181AbgGMOtw (ORCPT + 5 others); Mon, 13 Jul 2020 10:49:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730175AbgGMOtv (ORCPT ); Mon, 13 Jul 2020 10:49:51 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66C5BC061794 for ; Mon, 13 Jul 2020 07:49:51 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id j4so16864415wrp.10 for ; Mon, 13 Jul 2020 07:49:51 -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=8XFfrtDb0YISFxdApa9cgcznz1fKsVfnxLcnox2gJ38=; b=bY+eI2Sa1VcgBw/m+GSPdg+IKtmwOksNpPhNngNhJ4tpus+dIQgVEyXQmm5h/Mo+8d CFGMao+VaidBm/qr7yKY8/suL3RWH+306Rfniq0CT6jdAnE7udAzLAZ38vDwZTSgwCxP 9Zfvo7Amfu/J/ldW9uMo1y69ApSm1SwamkBSUJZYzG+E0lsy1bD/tTOlXKuPBU95ZPwZ 5NNTSXixUFUk4gTpO9djXoEEhSurqXpdLHwBPR04hIDB8s8nXY4sx0MYqnLsre6mwD/M tVq7d9wH1fGqnHlxr+56BcsdYIdOJk6QJB/JnCveFhAqYodfYN9gC3Sf0THlqUv0vJFp w0fQ== 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=8XFfrtDb0YISFxdApa9cgcznz1fKsVfnxLcnox2gJ38=; b=oRh6YGnswzZ6LtXwLRIB2DXSV53uDFj27hgUssNFMsg9I+fsZ0u2sTgR3EP0ZkzL7U 4l3V/FUONTqFE3ZLo5zRLkiE/98b5mMYbTNRxoIGuXscmPpY/3eQKaVl8P+4w49l6YrN 9+J5dx7HZR/bn3LukcSeDeDEuJ7U00Ksjkwi15QV5r+xgHfX3YFvMBofZYSeyE6fco99 KJLzDe+/5RqyIFF+0VOS9/efIceUNdxU73U5IBwP5RNG3KeiBglSEp3F2eJad8/Pq4IK 18PXVgCcSOoDy8OQGQt8+jdzjO8u8kve8ZVjOXek0C5ri/+zlv94kUKiQZ7Jd8DUCJoY eapw== X-Gm-Message-State: AOAM533XQS92ok6UjhgXVwLoIDLlr3DHNG79pM5MvdN3hz0TLPE06Mg2 IWgdNffjWJbsGf8tY8V3Z/M/Yw== X-Received: by 2002:adf:fc90:: with SMTP id g16mr79197339wrr.42.1594651790130; Mon, 13 Jul 2020 07:49:50 -0700 (PDT) Received: from localhost.localdomain ([2.31.163.6]) by smtp.gmail.com with ESMTPSA id o29sm26207756wra.5.2020.07.13.07.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:49:49 -0700 (PDT) From: Lee Jones To: linus.walleij@linaro.org Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Lee Jones , Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Subject: [PATCH 16/25] arch: arm: mach-at91: pm: Move prototypes to mutually included header Date: Mon, 13 Jul 2020 15:49:21 +0100 Message-Id: <20200713144930.1034632-17-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713144930.1034632-1-lee.jones@linaro.org> References: <20200713144930.1034632-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.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 --- arch/arm/mach-at91/pm.c | 17 ++++++----------- drivers/pinctrl/pinctrl-at91.c | 1 + include/linux/platform_data/atmel.h | 5 +++++ 3 files changed, 12 insertions(+), 11 deletions(-) -- 2.25.1 diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 074bde64064e4..59f2a2d6fbbb8 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -25,17 +25,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); @@ -325,6 +314,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 9c52130876597..37997e5ab0538 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -22,6 +22,7 @@ #include /* Since we request GPIOs from ourself */ #include +#include #include "pinctrl-at91.h" #include "core.h" diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 99e6069c5fd89..666ef482ea8c0 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -28,4 +28,9 @@ static inline int at91_suspend_entering_slow_clock(void) } #endif +#ifdef CONFIG_PINCTRL_AT91 +void at91_pinctrl_gpio_suspend(void); +void at91_pinctrl_gpio_resume(void); +#endif + #endif /* __ATMEL_H__ */