From patchwork Thu Mar 1 15:27:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130298 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952921edc; Thu, 1 Mar 2018 07:38:57 -0800 (PST) X-Google-Smtp-Source: AG47ELtUGftx6Qdh1u3kGqh9EMFZtzJmQ5TFGKo8yBmZn5urpms39o7m4GvWOH3wb0t989fYA3f6 X-Received: by 2002:a17:902:6c41:: with SMTP id h1-v6mr2266393pln.25.1519918737172; Thu, 01 Mar 2018 07:38:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918737; cv=none; d=google.com; s=arc-20160816; b=claqmsss54B5M4c0WayzrdTSKE5BgYsnvrgJCioUFQ4flGlG6yzoehHHPFldKZZYhA Rl/x0t46KzHJhVJXeTm/PSkKYNr1vJRyJc82cJUB+dsrOMlYNCLvUqQXug5Kth+T64jq 87Zxy7JcmbXwk/2G20HmI6synOLIz2mxFndo3S4Wsvj1iV289oNSuAbcXo3ulfitmHLl TWcYNxrPz+nQeukpzcVylEr9v/wBDbDyxN2W4TPXURFtsDqZ9TTOgdWpSjg4YmQXbUV5 sua9JqtAfxAsQ6yEye/C0LD+9O3FwTIECTu8HtNcPnJfColW88FiyUxrsQDyGq7fU5ec 7sPg== 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=R0iHcXTQbJb9iO5j7j39efRUuBi6/4sQAoDQ3e32uC4=; b=YxwMGwCLdfL7hfeC68Fc4NTMTAvAEiVLpPYGOmo8AT33mFrZVFNA/94r7TSI83uDvU lbcmfMXqJxAZwdg8Z06VHYhUf/+verHUdpDVg8bpLMR7chfwWtdaFWoD+Nvporm2GDiF veRrAAgFmTiTVlOcFpysgyAFZbLPGiDfurco7iJcg7pMdE4nnJjuN5kkLINXhlg4YcSM XcJ003YwIHtR20Txchi11HhkqOOfWC6LLvbWh9ZUoMCem42NNL4lc4rBljH7eNtym9fT ton6IU0XJd3TSCberI0pI0skTXsOUf8Es83SKYh329NcwYK5E6Rwh7SJWaOFrc5Ygoi/ 8o8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=E/mvUqbH; 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.56; Thu, 01 Mar 2018 07:38:57 -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=E/mvUqbH; 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 S1032564AbeCAPiw (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:52 -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 S1032494AbeCAPi3 (ORCPT ); Thu, 1 Mar 2018 10:38:29 -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=R0iHcXTQbJb9iO5j7j39efRUuBi6/4sQAoDQ3e32uC4=; b=E/mvUqbHvOebr6xzcmiPFErdVbMaf8TUmY1K8PmFDfOfX3Q85dsds8RX4jjOtnoyJNgIpwflw7iHfUXqCs24mHqy2fmyEseX40zQ0xqUMoN5Zg2OvDHc6z5QJbzThW3yOEfNLQvY60i0tE8YJoagbFcUU7FBZxvwU057owgfR+0= 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:24 +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:24 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "Martin K . Petersen" , Sasha Levin Subject: [added to the 4.1 stable tree] scsi: mvumi: use __maybe_unused to hide pm functions Thread-Topic: [added to the 4.1 stable tree] scsi: mvumi: use __maybe_unused to hide pm functions Thread-Index: AQHTsXHKqAElypauWkCBgzBfV2UJ7w== Date: Thu, 1 Mar 2018 15:27:21 +0000 Message-ID: <20180301152116.1486-455-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:oNFU6h5VYWKdeF4sKsCLUkdR67xhiEZpqH4khayQ0K8E8qfxC1kRldaBQTdL0e84fF5tHA+KK+ekYdkrndoqeK+RrCw8Efrhu3QKLEBUR/UQYYAZCiaVh8DnH6yM7tNM1Qk8Yu7Su2XednPlE3nIeF2ZCwzPvwHbAana2KoJM+caFo8kuWgc5Upq9ftzdat6YXJXO/1KnxNrq3BfD/GYmRGGR2h09ySRvprQSxxVQiZzyrcBl407PjNsVdUlIXpF x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: ade86857-2f19-48a0-6a2a-08d57f8a78aa 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)(146099531331640); 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)(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: 8LSl4H5rSvorfvoxjnSECV1N34Baia/lahomeLQnqTs8FsVBjdg02JOdBFhpqxVNk/Jew8GHqgks4Ixm++Z9dFzL9AloX4h6oZfxm+E1ffcwqRNXg7uFGZDn8+LWYAzbDbRZeWL0fxr8nNYxxTZ4FXtO6C6man7dlkc4WMWqpA8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: ade86857-2f19-48a0-6a2a-08d57f8a78aa X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:21.7202 (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 fddbeb80a904aae41c84ed566e2b0d1de55907df ] The mvumi scsi hides the references to its suspend/resume functions in an #ifdef but does not hide the implementation the same way: drivers/scsi/mvumi.c:2632:12: error: 'mvumi_suspend' defined but not used [-Werror=unused-function] drivers/scsi/mvumi.c:2651:12: error: 'mvumi_resume' defined but not used [-Werror=unused-function] This adds __maybe_unused annotations so the compiler knows it can silently drop them instead of warning, while avoiding the addition of another #ifdef. Signed-off-by: Arnd Bergmann Reviewed-by: Johannes Thumshirn Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mvumi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c index 3e6b866759fe..c51e1537ed8e 100644 --- a/drivers/scsi/mvumi.c +++ b/drivers/scsi/mvumi.c @@ -2629,7 +2629,7 @@ static void mvumi_shutdown(struct pci_dev *pdev) mvumi_flush_cache(mhba); } -static int mvumi_suspend(struct pci_dev *pdev, pm_message_t state) +static int __maybe_unused mvumi_suspend(struct pci_dev *pdev, pm_message_t state) { struct mvumi_hba *mhba = NULL; @@ -2648,7 +2648,7 @@ static int mvumi_suspend(struct pci_dev *pdev, pm_message_t state) return 0; } -static int mvumi_resume(struct pci_dev *pdev) +static int __maybe_unused mvumi_resume(struct pci_dev *pdev) { int ret; struct mvumi_hba *mhba = NULL;