From patchwork Thu Mar 1 15:27:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130307 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2953395edc; Thu, 1 Mar 2018 07:39:24 -0800 (PST) X-Google-Smtp-Source: AG47ELsYavsjhOCmLYFHg40rZIDwG1t+fpFFmFQJjC3B3gEfIgn78WRBVNqvx70oCR4/xKL4Fttc X-Received: by 10.99.190.15 with SMTP id l15mr1913374pgf.325.1519918764259; Thu, 01 Mar 2018 07:39:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918764; cv=none; d=google.com; s=arc-20160816; b=erOGShAQh9mFBtG4kS7FUrVo95ae4vWgmPMq6mPOjrRMOBQmeixLdS5ya7Rx+D04Rk zBmQh498LGn6wYkBuS9NPIiqjIHSAD6/n1Hvc6+9tR5GfLMjUuVmTxflz3fQDCfNfpxN DipKS4H2453tzJ1NoCNdcYL5H6Oobev4qgNZhumbdOfJ3+Gfp4EoaB+HnHn0B/tK7Wp2 39Pp04aNtrmsPKKBdCHjtsz7sMyjzzIbPoyvVcDdfZ6xrBuv8rD80VVQ4sg7n7rrmSSq 2jSzVpGbDhEb1ouSioWRJAR7SPXDAIHkX0AbfpQWcTjT4iSGKZJhzW1OocxneVQh1JnO zL/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=yYuUdwrzJLdDjAxs0s5uatgYJPdE9zjBSSl/8Rvs1uU=; b=H8r/MtDotPahMpFxEPyAbebWunUtgtx8EIv6XKdZ3RZMwHQwWSAA4MMHMXcFeJUCwj CzXwUZiRCpK4HVCFThAOdFIiWrmRaAm+wBEimsHrApRa/S2hMdHdzG7aV+IklkeErTKz ho1dvICLJ8PaJtHoiDIXBKDhz7EM8+FXVFRdqdSpn0MuoDR+VE1BvOKy5+5AM7lxUWQp yfrRUenNnsNxpIYguSewrHs2mswVKEo/4keDy871x7lRo00kcTZAtqjD/foG44F1zDsJ M1wK7suXT7+9+NnU2tT1pPkmeG2kJZhg9yJIAoPI48HnAN5bftJUvBirQzWz+z/ieEYo Ya2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=EVHiNtS2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k15si2606322pgc.482.2018.03.01.07.39.24; Thu, 01 Mar 2018 07:39:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=EVHiNtS2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032595AbeCAPjW (ORCPT + 10 others); Thu, 1 Mar 2018 10:39:22 -0500 Received: from mail-cys01nam02on0137.outbound.protection.outlook.com ([104.47.37.137]:54886 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032471AbeCAPjQ (ORCPT ); Thu, 1 Mar 2018 10:39:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=yYuUdwrzJLdDjAxs0s5uatgYJPdE9zjBSSl/8Rvs1uU=; b=EVHiNtS2es4xmYj18wytcfucPu/YvTPtvJthF04aAunsaVUVyFL74WcqxR8hPTWfgzf05DayESCxl43KSl0XSAH+GiNE5Iep8mFjuI0vu/9qUxNvWYf1NtvhzxxeCEKoczBbRXWMHPfEI12U2BRu0GZCQj95lzFE/E6mhZJ35zo= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1077.namprd21.prod.outlook.com (52.132.130.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Thu, 1 Mar 2018 15:39:14 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:39:14 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Linus Walleij , Sasha Levin Subject: [added to the 4.1 stable tree] gpio: xgene: mark PM functions as __maybe_unused Thread-Topic: [added to the 4.1 stable tree] gpio: xgene: mark PM functions as __maybe_unused Thread-Index: AQHTsXHWeoxpQKfqSEyvt4m5mLaJ9Q== Date: Thu, 1 Mar 2018 15:27:40 +0000 Message-ID: <20180301152116.1486-486-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1077; 7:yI5JVuYiwPoHJTFRCNmauyqOOJ4meB+Os9q41KSqAv56w2VXL1kKux5JbYd4YEYeCmM9VVFlvY/CbwpHbH4H6GIa07avrQ/TQfkKJH33hO8CTysd/oToOuZOXBdni7cDGO4kPg/eQaWn0OUrIxtIzP+pmZHBpgL02EXstWwcOsm5eU7PnacVs19ewKItfTC10yV95qrHrvWVzSc6nUEvRQI4DpLXIHQ3aCIaHVMfl1Rq3KsG5jmf+lNNBprZyUfP x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f678e3bc-204e-47e8-d544-08d57f8a961f x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1077; x-ms-traffictypediagnostic: DM5PR2101MB1077: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501224)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB1077; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1077; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(39380400002)(39860400002)(396003)(366004)(189003)(199004)(81166006)(2900100001)(10090500001)(2906002)(81156014)(66066001)(8676002)(1076002)(6116002)(3846002)(105586002)(8936002)(107886003)(186003)(106356001)(478600001)(22452003)(14454004)(4326008)(68736007)(25786009)(10290500003)(102836004)(6506007)(6346003)(59450400001)(26005)(36756003)(72206003)(6512007)(53936002)(6486002)(3280700002)(6436002)(3660700001)(316002)(76176011)(110136005)(5250100002)(86362001)(54906003)(7736002)(5660300001)(2950100002)(99286004)(86612001)(2501003)(305945005)(97736004)(6666003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1077; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: fDOOGOmL9DRDJwn0E0r03maZfZLPGvER2g+xJXEdMtHDybFbCkde7rvDoUQJQ/P+UD/2TQA2gQJAWXHC0yNl2iXhFRX1+eQNY8H9TZ8m2vVNFqjDAap8VlYGSC10+4mvsQ/1wEbeRbGyhV1wSZL7Fo4PaVCpwsP+nxUR1o3MNw8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f678e3bc-204e-47e8-d544-08d57f8a961f X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:40.7126 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1077 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit b115bebc07f282067eccc06fd5aa3060ab1426da ] 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 Signed-off-by: Sasha Levin --- drivers/gpio/gpio-xgene.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) 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,