From patchwork Tue May 3 15:26:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102387 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp657515qge; Tue, 3 May 2016 08:28:13 -0700 (PDT) X-Received: by 10.66.26.43 with SMTP id i11mr4448461pag.58.1462289293771; Tue, 03 May 2016 08:28:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n8si4972415pac.162.2016.05.03.08.28.13; Tue, 03 May 2016 08:28:13 -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 S933868AbcECP15 (ORCPT + 29 others); Tue, 3 May 2016 11:27:57 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60834 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933536AbcECP1z (ORCPT ); Tue, 3 May 2016 11:27:55 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0MFiib-1aue693p25-00EdYu; Tue, 03 May 2016 17:27:05 +0200 From: Arnd Bergmann To: Linus Walleij , Alessandro Rubini Cc: Arnd Bergmann , Lee Jones , Laxman Dewangan , Heiko Stuebner , Thomas Gleixner , Jonas Gorski , Irina Tirdea , Masahiro Yamada , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] pinctrl: nomadik: hide nmk_gpio_get_mode when unused Date: Tue, 3 May 2016 17:26:53 +0200 Message-Id: <1462289221-861102-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:/XxYPjF7yRkwiHUZVYzgxvMrXAoa9ADLFf86+6F7ZjCSCD+3Qv+ 9GGsHZi3fl15HNgNR5dZb70qWndUbCmx9oW5EwInPpDgMUAbd094K1XcZUbfoFqarI4b/sC /OoIMEbclPr35twrkxfEkUhmdsyPTdJra1d0AEFwtfFg3kCR3xo9ODT8/9Nki2i+8H4XyiG 2CKEOk+VGnaveBNPGdfig== X-UI-Out-Filterresults: notjunk:1; V01:K0:dppoHp8ZjGs=:n+QYcsV1fNzB9KRn0n65Ok IZNSeHIaWIq9jOXBvp3rsZ1MefoRjYRfruxfTghCwQA40jimCS66oobLsKvze1d4zaq7nn7o4 zHR3ICEi7+OcyFDLL7+9057/OjlhgQc64KYs9pYdpx/q+bdYnvQrtd9N84Mu3NLiNpMnjLIoz jVtyhaG7zOSY8rv5tyzWJ6altZPUUeiXzSl53o4LOYQzcTTQTaLp6VLCHo1ARwV+BRs+9uPhl VaB+Aksr2LFpn95i8C95lxvaHR2PZo+fobBN7cm01hB9brr5jlZiZV/TX1O/dv1CQMbcG/AeN 5WaIqFe7sbbbJf4e8eDDL5jopK+S8s/hVZcpRKTs5LO9/l0XKBDOizHt8Azknxq4Nio8ae4FO zj81O/g1DEQ9mwlueSvhZPsfrmP43R69xWAX56DUarqbK+haHqzDcDo//eCya6knxCriekzcx ZYlN0PpaxCh0iJPW5BETp7r44v/uvqTMtPg5zbFSHHN4k0KUkYpXvqfsB7HV/QSfAVTFqqM41 7lRPtsiDAGETgPBAdr1ORwgEn+h5UC9Hz5/mehLnH935UpjmIVp/SYMAnTDfwbIlAMQg0JZX7 NeFgIJQoUN5lRCQC33XDghdH1w9H7YttK9zbz71f5qo27ABS3+v1pKsNkq+ugXsGJvRnevWFN MCE76kZwzjA55cFWJRfabNbyWW1MXcV5Fqx1rRM9kwwPAHEPDhVJDlJ3b8CfymDNDLC0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nmk_gpio_get_mode is only used in one place, and that is conditionally compiled if DEBUG_FS is enabled. A recent cleanup has marked the definition 'static', which now leads to a warning: drivers/pinctrl/nomadik/pinctrl-nomadik.c:614:12: error: 'nmk_gpio_get_mode' defined but not used [-Werror=unused-function] static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset) ^~~~~~~~~~~~~~~~~ Moving the function itself inside the #ifdef shuts it up again. Signed-off-by: Arnd Bergmann Fixes: 5e81e0a0913c ("pinctrl: nomadik: use BIT() with offsets consequently") --- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) -- 2.7.0 diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index e5c71acd9506..ccbfc325c778 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -611,20 +611,6 @@ static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, return NMK_GPIO_ALT_C; } -static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset) -{ - u32 afunc, bfunc; - - clk_enable(nmk_chip->clk); - - afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & BIT(offset); - bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & BIT(offset); - - clk_disable(nmk_chip->clk); - - return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0); -} - /* IRQ functions */ static void nmk_gpio_irq_ack(struct irq_data *d) @@ -929,6 +915,19 @@ static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset, } #ifdef CONFIG_DEBUG_FS +static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset) +{ + u32 afunc, bfunc; + + clk_enable(nmk_chip->clk); + + afunc = readl(nmk_chip->addr + NMK_GPIO_AFSLA) & BIT(offset); + bfunc = readl(nmk_chip->addr + NMK_GPIO_AFSLB) & BIT(offset); + + clk_disable(nmk_chip->clk); + + return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0); +} #include From patchwork Tue May 3 15:26:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102388 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp657371qge; Tue, 3 May 2016 08:27:58 -0700 (PDT) X-Received: by 10.98.41.70 with SMTP id p67mr4399519pfp.93.1462289277963; Tue, 03 May 2016 08:27:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v15si4845160pfi.153.2016.05.03.08.27.57; Tue, 03 May 2016 08:27:57 -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 S933839AbcECP1z (ORCPT + 29 others); Tue, 3 May 2016 11:27:55 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:53218 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933764AbcECP13 (ORCPT ); Tue, 3 May 2016 11:27:29 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0LeAyi-1bRF1F0ChY-00pt3h; Tue, 03 May 2016 17:27:25 +0200 From: Arnd Bergmann To: Linus Walleij , Yendapally Reddy Dhananjaya Reddy , Ray Jui , Arnd Bergmann Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] pinctrl: ns2: rename pinctrl_utils_dt_free_map Date: Tue, 3 May 2016 17:26:54 +0200 Message-Id: <1462289221-861102-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1462289221-861102-1-git-send-email-arnd@arndb.de> References: <1462289221-861102-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:9Lgp6eZg9W56hdGZldiuKMrJmyhY7xPsKlGkUh+U74CZ5XRGq7t gv80qTk8S/EzdEpC8WnHCcELvKQ9CY1UMMMOFs/xIAs35Cxu9bBSCcOW+njnkTyBrWKHKYi PY4evh22I6M5OA2X65rdexHcLd6HZrt5gfj+CZnfhRe1lbYu1Vv1ZSenOvnTptkPAik1ECW OzrYWddWHPb4oXmIHBMAQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:eRFn2vwyvrY=:TmQgwP9XdfJdLFDaC6hPKg ifCoFcw+qwIAAt6FpIymvV0U+YCDhWkfhiXe2uVXMToPTI2qV6+3eH4gBASgkfmm+FEWIIm0i f2EfdVRvTuDkD18Uqm5RdqeXSgz735X+7RvH2VMVrnVGzpLypqC429sPD6N7BKr+cr3N1KT9S ymYvehg3nFibzfI06HjuZfFJyR/z2WzAFPLYcPay9g7qnUtKdZ+IeJhcAnVT3Jtmxbyh9wnUk LyLi4HZXIGQ0jOwrYN62KuKxj5stFDBwFA9d2fE+zWWx4hP85o01UpgbDdm0FOrGXZCihPiUh YQ7W48YAFYBEkZBPfFVjDcjtmJ+qlsgP3lLemd4k8l51YP/DT4P4FThASlQ4pQ3n4m2E58YCT JvkoL4S3V0ykCQq5sZIbb2Ly5TSogznSvQXIZE+IedxPkBp4TJioHrLJ1d1tDLmUqAmNLSXS1 mNnDKQ/ZlZ2Xqc5iHwlHSmBqLgRRZfmxCM0IVDP1Gup0HK0llkyf8YmPpFpAEM9PipT/xmQMN 8dM8t8ojzUsg2PGTcbK/XYbbN5AicnFvTm1OotVNcJyXvX4artBXYjDPfDUDDypeogIiVTbi/ 0ZTmsaHkATOquGBl4cXCTmTf+MWuTVx1ATmYRriggCMtUYtWviZHhRlmZyMwPl4M9VRvXl4fJ IIKmb34poTz+ZOVYp1nwcQrohfCRm0IlS9k2HtRCyLk+AIzzKdHpmRrwY8O6v+La8Jd8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A conflict of two patches caused a build error when a function got renamed but a new user appeared in the other patch: drivers/pinctrl/bcm/pinctrl-ns2-mux.c:540:17: error: 'pinctrl_utils_dt_free_map' undeclared here (not in a function) .dt_free_map = pinctrl_utils_dt_free_map, ^~~~~~~~~~~~~~~~~~~~~~~~~ This renames the new user of pinctrl_utils_dt_free_map accordingly. Signed-off-by: Arnd Bergmann Fixes: d32f7fd3bbc3 ("pinctrl: Rename pinctrl_utils_dt_free_map to pinctrl_utils_free_map") Fixes: b5aa1006e4a9 ("pinctrl: ns2: add pinmux driver support for Broadcom NS2 SoC") --- drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c index 1fd57db52d7b..3fefd14acc3e 100644 --- a/drivers/pinctrl/bcm/pinctrl-ns2-mux.c +++ b/drivers/pinctrl/bcm/pinctrl-ns2-mux.c @@ -537,7 +537,7 @@ static struct pinctrl_ops ns2_pinctrl_ops = { .get_group_pins = ns2_get_group_pins, .pin_dbg_show = ns2_pin_dbg_show, .dt_node_to_map = pinconf_generic_dt_node_to_map_pin, - .dt_free_map = pinctrl_utils_dt_free_map, + .dt_free_map = pinctrl_utils_free_map, }; static int ns2_get_functions_count(struct pinctrl_dev *pctrl_dev)