From patchwork Thu Mar 1 15:27:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130288 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952573edc; Thu, 1 Mar 2018 07:38:40 -0800 (PST) X-Google-Smtp-Source: AG47ELuYcbufUK3oSpUg98h7DpxOTh/nonjcGGyukYmYlh8re/lr6cbNu7mhUIEaXQtlLrjVT8tD X-Received: by 10.99.126.14 with SMTP id z14mr1901414pgc.429.1519918720204; Thu, 01 Mar 2018 07:38:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918720; cv=none; d=google.com; s=arc-20160816; b=RzHo5lVkdkNeilze8r4AvfIuKhEbu1Femv1MQ/RKo47RRGfHxpsvQpZ3cM76HtPL0r 2SlAK7z9dCFI8SdFuUryXgiA33D8xrvJnmahX+0L+ppOFAwZFhExxXj97JrqqA14clgu ncQSteOL+SMLuV0ZyEr0D3fxzWLGWgKAL43pQHqdaFrbBUyA5lvzMJayhtix3fFCv+lt 5606qEs9Wu67fAo2eoAB3wwUl8PQtEmdTgGUCssn0OT1xaFHjtnHd5ztVyLaE31sPPVu e1I95lmWdaOs0VRjtXGIEh7VZgOvW0Rd0Dbgv2kp9P9UHVpLaIqjw+C3I0ytIu6tCeza SRKA== 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=fmA6e9aIPyVEevqn1y++YFUT6OXGu+3MxWZt4PHp05I=; b=cbynlpB3cikNQqVsfIGhDev0BlJYUlsmc//MwWg1Ly4hSBg5rY/c4wsIW8K8dMOCtz 2IZeHiblIy7OfZm3f0syHj6qqvoCL3sAxoHlRaO4pGLgCFE9Vv/hjdyhLBzI5WaiYQOl jub63pUXhFgH0I4fRauMEJVRKml8vBLoP9tVbyPxCCdo96UyEt9sFGYptCRFiOnePvMd X/pY8KzFGHLR7AoPVucA9vztNKjjiNiqIBYhsP+nEPjyWXxWE3FBKncdB/ye4otHlc4l 8mG0hk5CxJkKuQ3kwmBK0KiSzYgQ36GJk5rGu+MB1HF8DPKbaVT+hFjYd63ypsiFoNPN VmKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=kYptZDWi; 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 b15si2586092pgs.318.2018.03.01.07.38.39; Thu, 01 Mar 2018 07:38:40 -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=kYptZDWi; 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 S1032509AbeCAPi2 (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:28 -0500 Received: from mail-sn1nam02on0103.outbound.protection.outlook.com ([104.47.36.103]:11220 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032494AbeCAPi1 (ORCPT ); Thu, 1 Mar 2018 10:38:27 -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=fmA6e9aIPyVEevqn1y++YFUT6OXGu+3MxWZt4PHp05I=; b=kYptZDWiDnZdgYcjFUj+NN5ZYWtjZLyjWAD4pNvebGTi70T7SBW2oyE4mBWspE1YNvLKfVWqJ8zQuBvhL9hGMk+nQ0HVJl7zvQrcZd25FbsYNHoXxE+ig9bHiChWUweQf1d/yXgFk7eEM6ySCOYBScrMA9KWLCuAtbOfypUr2do= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1016.namprd21.prod.outlook.com (52.132.133.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:38:23 +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:38:23 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Greg Kroah-Hartman , Sasha Levin Subject: [added to the 4.1 stable tree] staging: ste_rmi4: avoid unused function warnings Thread-Topic: [added to the 4.1 stable tree] staging: ste_rmi4: avoid unused function warnings Thread-Index: AQHTsXHJmwyWa7bIx0KdwS6Hivgauw== Date: Thu, 1 Mar 2018 15:27:19 +0000 Message-ID: <20180301152116.1486-452-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; DM5PR2101MB1016; 7:DYPJit4i777ghunPtM/wTimQdwk5KQfjnnw7snqxwz54LirVYIX7HkwlGdv09Ym14PAAXjdq5GmXjVo5UL5yW73S+mIUFx3wwINEVrMgqXb+XABMpDfV0lMkJqgYTM8t9QR+RelQm5ljUJt3yrASlzSzG12ixnEhYqBrtatoLJXY71Ndt8y2inODyaLpo1e7VOO0euEACSnCq5EXICNDRofC4q7x1Z1UJDbhVoOL5G/32iO9fwHgC3WhLsznsP/z x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 6acb9334-f954-4de6-edca-08d57f8a77d6 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1016; x-ms-traffictypediagnostic: DM5PR2101MB1016: 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)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501229)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1016; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1016; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(39380400002)(376002)(396003)(52314003)(189003)(199004)(22452003)(6436002)(8676002)(81156014)(81166006)(53936002)(68736007)(6486002)(6512007)(97736004)(5660300001)(86362001)(575784001)(59450400001)(6506007)(102836004)(6346003)(2906002)(26005)(186003)(4326008)(10290500003)(8936002)(76176011)(478600001)(105586002)(3280700002)(14454004)(54906003)(110136005)(3660700001)(2950100002)(305945005)(7736002)(6116002)(72206003)(1076002)(3846002)(6666003)(316002)(2900100001)(25786009)(36756003)(2501003)(66066001)(107886003)(106356001)(5250100002)(86612001)(99286004)(10090500001)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1016; 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: yn9cy3i6Chbnu2rp+85qX+utHsH6EJQjE9IxGdEtE6/FbtwuC7ciR5/HCujDwPnAfzWMTx/gXzV4cfPZkD48gPvkMKJIIhOzYXUkerzSI4re0JlgHG1VdLokIdlUxuExTwp+3a0pIzqiLdgHTChxPJJgmT5c+Gg8bb9/ZRd4WhM= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6acb9334-f954-4de6-edca-08d57f8a77d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:19.9619 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1016 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 9045a4a7e686a6316129d6d0b21b4fe2520968e4 ] The rmi4 touchscreen driver encloses the power-management functions in #ifdef CONFIG_PM, but the smtcfb_pci_suspend/resume functions are only really used when CONFIG_PM_SLEEP is also set, as a frequent gcc warning shows: ste_rmi4/synaptics_i2c_rmi4.c:1050:12: warning: 'synaptics_rmi4_suspend' defined but not used ste_rmi4/synaptics_i2c_rmi4.c:1084:12: warning: 'synaptics_rmi4_resume' defined but not used This changes the driver to remove the #ifdef and instead mark the functions as __maybe_unused, which is a nicer anyway, as it provides build testing for all the code in all configurations and is harder to get wrong. Signed-off-by: Arnd Bergmann Acked-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index 0f524bb7b41d..daff4e76b6d6 100644 --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c @@ -1039,7 +1039,6 @@ static int synaptics_rmi4_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM /** * synaptics_rmi4_suspend() - suspend the touch screen controller * @dev: pointer to device structure @@ -1047,7 +1046,7 @@ static int synaptics_rmi4_remove(struct i2c_client *client) * This function is used to suspend the * touch panel controller and returns integer */ -static int synaptics_rmi4_suspend(struct device *dev) +static int __maybe_unused synaptics_rmi4_suspend(struct device *dev) { /* Touch sleep mode */ int retval; @@ -1081,7 +1080,7 @@ static int synaptics_rmi4_suspend(struct device *dev) * This function is used to resume the touch panel * controller and returns integer. */ -static int synaptics_rmi4_resume(struct device *dev) +static int __maybe_unused synaptics_rmi4_resume(struct device *dev) { int retval; unsigned char intr_status; @@ -1112,8 +1111,6 @@ static int synaptics_rmi4_resume(struct device *dev) return 0; } -#endif - static SIMPLE_DEV_PM_OPS(synaptics_rmi4_dev_pm_ops, synaptics_rmi4_suspend, synaptics_rmi4_resume);