From patchwork Tue Feb 20 11:54:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128872 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4553098ljc; Tue, 20 Feb 2018 03:57:48 -0800 (PST) X-Google-Smtp-Source: AH8x226iTvlY4cFQSpONr7MV9whkaklICzOQ70BNdi3bZxumx/FPFlcxXU6+nkLYGNwI+BXjwP8W X-Received: by 2002:a17:902:b40d:: with SMTP id x13-v6mr1548882plr.320.1519127868784; Tue, 20 Feb 2018 03:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519127868; cv=none; d=google.com; s=arc-20160816; b=a56scBv2vnbq3xDBSBgK/hcbyLIJZIwu2e+k4YYWqE69sLqGU/OXlHQnAVdkbGLJtE mGwrGJPTIeZFVtvXyXGJEqTPVQjLsoIWvzJYdmVViQIGOgkTX9R4V8CvUYdB1tVi5SLd P9yh9/7Yw2tyh5FtuhRutRnzMWjKpEAVsMDaHqYK6AO5VlOgpiede963IdNqe47cOK1q KM+aZcqR2B4eafq3msCroMbNCw9A66mN0+b3m+dswcsCTYqFWnn3KaXO9JVtvox47jdP Uy9NkseRllZ4txfkNEDGcVGofZEk1XmBM0ojNbHBnP9cxb+4MyxGynCVNNKbnOAQTTbG f9rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=O3zQnuMsyJ+iGP/Z7vaTKsP2M3zRctspLbZfNgRN8hU=; b=MgEP4VGAIgjukbQIgY2sBga8c5FVJ0EzqHVqrKd3hESPQh+ChsINxrQEqkIJdzT1Ax KFtDZmHPP0noK4L3hiRFbDY7Rcbzs3zCUfSX59DJSo/MAoyxt1MhmWxPCOpFOh+hz7NI ybccnAz5vpRyZ046O6VAPceX3JZ7SHGTT3DfRnsAdn1Rh+2S7B+HgVDSeYiUdzYUWrT+ ES9WOrZmCYos3j7fZscn0emYC7HWdGqAYNn1b5IvreB9bszM6XPeWRKnY2WRrr5qvQRZ W6wj+G3W15syYuiotuIifIKdM5pZrhMbkidPDVFxFL1KNSCx8/mLZnKxX4ui3OTmPhsS echg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3si7879586pgc.496.2018.02.20.03.57.48; Tue, 20 Feb 2018 03:57:48 -0800 (PST) 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 S1751661AbeBTL5q (ORCPT + 28 others); Tue, 20 Feb 2018 06:57:46 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:37593 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbeBTL5n (ORCPT ); Tue, 20 Feb 2018 06:57:43 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LxOqw-1eiJ692etO-0170Nb; Tue, 20 Feb 2018 12:57:39 +0100 From: Arnd Bergmann To: stable@vger.kernel.org, Linus Walleij , Alexandre Courbot Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , linux-gpio@vger.kernel.org Subject: [4.4-stable 01/22] gpio: xgene: mark PM functions as __maybe_unused Date: Tue, 20 Feb 2018 12:54:48 +0100 Message-Id: <20180220115527.1806578-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:dUGZk+kvCgCJDZBqh0EahzGCYEGuzISKu+YXHXIAusBVL20Z4Hp XGM4OWC+HEIaVw/TlUYRevoGIzSQ3VGbFSHrx0OTgv4WDlJgw6AmIhtdUcuhac7TvLTfHsy 7yzti1L2CQPVh0iSIZzRR5aU6Ng3Hg9+DXZ1P0VnsVKOLcSi+unUTI9eCajYTxGvWhahDT5 TtF+DIQ+XEnpEn7jN073w== X-UI-Out-Filterresults: notjunk:1; V01:K0:AUYM+Ufq0BQ=:fZjJtv+sGbkVMzg27+C2ba F5aPEWk3FAofrAOS+QzdHPk7l1P65hhaP9kKG06aWgRmbrjSf34w9psXAsCG4+sqAhG+YWu1S De1dt/lVBdDX+pOd74q6AYGE2yJat8ns3XreK7wSJBD+n2FEb2EQjNwOytSCpon73V6Aqtotz 9O6tbDpnH6aAr5bwEW8tkw6mCNMSRp27TmBMNaeeEMWbNd7thTFWEt8OatCzjnXkgVdQihqGf +TMVOeDw3IVHpTlMHL/IhS1iGHDixU/kCZ1ClhtFdFiF5DyJpE52deIcrHFqjvQbj16FLOHDT fEb8iVd4GDRNlWlYS26nGX8ABI0CKKizTlLaiaUFtG6yFjq2yCDYkcVemaa6jsiCMBtug//u9 j7KScaC593TLsYupQKtg2QvQVpnM/LHpK78CwrNpuq/IOQeIWJrfVHu8pNrKr/Ql+gP6AmO5u Fbnm0y31s6cF9jKTABF/EXhHeENr6R6Y4vdflq9KiGXBEeOxazYaoLByOA2SEDmZ4MfgYyo6Q O6gEQDACQzdEtc812wBDkaidaI3JQ+cwmC0JxpYoTPq7bjieFCrkR8sdol/Egqm+Z1kCW7PHx 9c+Tz0rFQPdkz7gcj8AtFUgmUQ/S93M/VtZlVnMTgyz8ttYjtWv+CIVSCLRsRv1nuu4uYKtcL jlWtOeSoEGDUJIUNEult2VOs7ayjX+J+gwBZv0Z6Qp4Sc1HjWaUGI3xPPqjuRyRc9TMS36fF8 r6hOP9bUGhNg0sinfRI+wR3x1U1DYcUvHjdBPA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_PM_SLEEP is disabled, we get a warning about unused functions: drivers/gpio/gpio-xgene.c:155:12: warning: 'xgene_gpio_resume' defined but not used [-Wunused-function] static int xgene_gpio_resume(struct device *dev) ^~~~~~~~~~~~~~~~~ drivers/gpio/gpio-xgene.c:142:12: warning: 'xgene_gpio_suspend' defined but not used [-Wunused-function] static int xgene_gpio_suspend(struct device *dev) The warnings are harmless and can be avoided by simplifying the code and marking the functions as __maybe_unused. Signed-off-by: Arnd Bergmann Signed-off-by: Linus Walleij (cherry picked from commit b115bebc07f282067eccc06fd5aa3060ab1426da) [arnd: backported to 4.4-stable] Signed-off-by: Arnd Bergmann --- drivers/gpio/gpio-xgene.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- 2.9.0 diff --git a/drivers/gpio/gpio-xgene.c b/drivers/gpio/gpio-xgene.c index 18a8182d4fec..7f1f32324504 100644 --- a/drivers/gpio/gpio-xgene.c +++ b/drivers/gpio/gpio-xgene.c @@ -42,9 +42,7 @@ struct xgene_gpio { struct gpio_chip chip; void __iomem *base; spinlock_t lock; -#ifdef CONFIG_PM u32 set_dr_val[XGENE_MAX_GPIO_BANKS]; -#endif }; static inline struct xgene_gpio *to_xgene_gpio(struct gpio_chip *chip) @@ -132,8 +130,7 @@ static int xgene_gpio_dir_out(struct gpio_chip *gc, return 0; } -#ifdef CONFIG_PM -static int xgene_gpio_suspend(struct device *dev) +static __maybe_unused int xgene_gpio_suspend(struct device *dev) { struct xgene_gpio *gpio = dev_get_drvdata(dev); unsigned long bank_offset; @@ -146,7 +143,7 @@ static int xgene_gpio_suspend(struct device *dev) return 0; } -static int xgene_gpio_resume(struct device *dev) +static __maybe_unused int xgene_gpio_resume(struct device *dev) { struct xgene_gpio *gpio = dev_get_drvdata(dev); unsigned long bank_offset; @@ -160,10 +157,6 @@ static int xgene_gpio_resume(struct device *dev) } static SIMPLE_DEV_PM_OPS(xgene_gpio_pm, xgene_gpio_suspend, xgene_gpio_resume); -#define XGENE_GPIO_PM_OPS (&xgene_gpio_pm) -#else -#define XGENE_GPIO_PM_OPS NULL -#endif static int xgene_gpio_probe(struct platform_device *pdev) { @@ -230,7 +223,7 @@ static struct platform_driver xgene_gpio_driver = { .driver = { .name = "xgene-gpio", .of_match_table = xgene_gpio_of_match, - .pm = XGENE_GPIO_PM_OPS, + .pm = &xgene_gpio_pm, }, .probe = xgene_gpio_probe, .remove = xgene_gpio_remove,