From patchwork Thu Nov 26 13:28:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 332944 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp1315078ilb; Thu, 26 Nov 2020 05:29:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvSEnrx7j8y4IB0ZfHQ9Fg2cM7AiPBlZ4ov/BX6c5Sqk04ukkHrSl/wghuznMVvyafh3cm X-Received: by 2002:a17:906:5fd9:: with SMTP id k25mr2619445ejv.539.1606397352333; Thu, 26 Nov 2020 05:29:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606397352; cv=none; d=google.com; s=arc-20160816; b=Fie6LtGCWRV1MzOeMk+oay7MAF3RdIYdqKVw5P/CwDjTeFZl98BsMMcGpwbNG44VLm IkBsAgyHu3LFg1i/MEiPWegFOHT2pp3G3JFfiMw/O8NeFQNP+MdFz7UIbv5Pzuk0iwGv 95gTUohb18ELed09ofcM3XaFhJxfm8h7/4khLo1yU3w/Jz1NmZgI0eVXawkTTDtSZGmZ H0UJmpQCHltYxeOvOqSbYmaGPX8zi/Kbjmy7Vm2u71oiqsU3FxWXK1nWTd5+w2ayESyU 78xD49amaiv0vM2jnnCTg7IpFRFuXWNCW+zfdpvAeB6hWFQvIQARcvxcKn1ZEzDXI6Me yPHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=j3jIfABHebgIQYyFTFzGmbyYJsJoQbpfkOYYN2ZM7fo=; b=E8s6WmG9R3/ajGlaJTFG+1AO/yaKnqzPChSFULtHhAQaV6w/amcwkQRLMx+9JarRTn HpCdms5cRuLXY+RkpHqaQn4AhU+DdpQ0d7QK6tQy0Kp5yLNMbYgGJ3QAF5yw2Fme/har HhV+hMNCHTxFIxMNOl4BMn1p+kiHxr0qHXDRJQO4ZbMymFkS8tTHeOhn94rJqGJMqClD s78r7uKuvApOSzuhX/7byr3h+0KlPGLGAUlISMuctodoCYezKOpntHLGYC/JqkJFF/sM 20uvFdEcn5ERIwtSHLSTwC9DwBjJfD5l2jVEWiO9UEgRr4Y0la5q8CE7AHbGOJYOIRDe 47hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ZV/eZfIM"; 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 v21si2468406edx.3.2020.11.26.05.29.12; Thu, 26 Nov 2020 05:29:12 -0800 (PST) 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="ZV/eZfIM"; 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 S2389852AbgKZN2p (ORCPT + 3 others); Thu, 26 Nov 2020 08:28:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389807AbgKZN2o (ORCPT ); Thu, 26 Nov 2020 08:28:44 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D7AAC0613D4 for ; Thu, 26 Nov 2020 05:28:44 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id r3so2167306wrt.2 for ; Thu, 26 Nov 2020 05:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=j3jIfABHebgIQYyFTFzGmbyYJsJoQbpfkOYYN2ZM7fo=; b=ZV/eZfIM43W03jQJiomsNpvL3M8Xh3ZEDa9SgEFel/1eJgOCQRYNDwnjNphuFPVUe6 Cu75OlfOHnbtg1VPxD16IwF+kqVWISdtQr7/IRrg6HPxJ0zR4hdIqTXJ63SLaRyc7gGJ zACoRj3zLKrxWyfpMeOSgLIBTqTCAPyEYD0b9BecjSqrb1LSdSnmRS95P2/X6snZKlbB b4PBHCSLFZ4AYJb0pnowd2rpv5vbOjVFQf91wUnS50wMFC/mIaOrlyA1xLHJ6Erkk2NO Gl55jhGewJFv/NI3Oq0nu6iCPtl2Nk8qqGFykzALj/kWMqnZ3B/aF0coK2WgRBgJwa0h 5nfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=j3jIfABHebgIQYyFTFzGmbyYJsJoQbpfkOYYN2ZM7fo=; b=R2b+GNMMBEjbRJGv1ZhQIrYpxQtBqpyHt5plYsfN2qYgJq8OPBqp9I7zfmGG7kq1gA k3rx7EcbWhBGuu7fjd80Afu4F9KaVVa8w1d01BADrjMUXIqaWq025IfP3V5qd9zydYLE +V0EjDfIKT8gHUsIyPKayLeSt7etQx7LNM/+Q4LDdlJ6a6U7a9YCaYvPIYAuPLHWNcTh 2TEslt00lWQwAN7hS/guOloHRVdsYCYLRnQX299IyPo12SA4PIVQgqgdVd4PTNlUem1A o1ZCqHRq9uuCCFN8OoZs8o+ZOXf0GklCzm8wAAzkpSimpIGzJVfodghf9ZsdG+aOxjsJ JYwA== X-Gm-Message-State: AOAM532smVDL9D7nPxfWu/7B9Z9qAxSqSZhBjZ3QwqUFEJac6yoOyCPK xnMIHdXcjlUF+2TRHYlrGqzxaAue1GwWJURo X-Received: by 2002:adf:fd06:: with SMTP id e6mr3897159wrr.206.1606397323119; Thu, 26 Nov 2020 05:28:43 -0800 (PST) Received: from dell ([91.110.221.235]) by smtp.gmail.com with ESMTPSA id b18sm9316605wrt.54.2020.11.26.05.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 05:28:42 -0800 (PST) Date: Thu, 26 Nov 2020 13:28:40 +0000 From: Lee Jones To: linus.walleij@linaro.org Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Russell King , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches Subject: [PATCH v3 16/25] arch: arm: mach-at91: pm: Move prototypes to mutually included header Message-ID: <20201126132840.GD2455276@dell> References: <20200713144930.1034632-1-lee.jones@linaro.org> <20200713144930.1034632-17-lee.jones@linaro.org> <20201112093918.GV2063125@dell> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201112093918.GV2063125@dell> 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 Acked-by: Alexandre Belloni --- 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 -- 2.25.1 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 72edc675431ce..0a7e10d39505c 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 */