From patchwork Thu May 18 08:32:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100054 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp573594obb; Thu, 18 May 2017 01:33:11 -0700 (PDT) X-Received: by 10.98.24.200 with SMTP id 191mr3159936pfy.207.1495096391482; Thu, 18 May 2017 01:33:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495096391; cv=none; d=google.com; s=arc-20160816; b=hyJtqqB+pUCFeX6EUEuo38jlTyGkYrqTW6NrpsJeqCLsJcwla8QlVEcoFOP6aKfi3e 7Ff06/+ikPnFRTHlkqfvgSbwIVbfPcBpumo0Ue+qxk3iH+0DvLVdXO3mdgBYCdZ9bL1p VeWsQukcx/FwXzmX3yIyhvK7UqTQ0/C89Bfv8RHgb+9RlfvZ/4k+jnwcLwset1FYwW7M njrqkmIdxHXQFBAG5vkbKNjLFss2juB36jI5TObqK906iGeHGkjL/gNlUWMJwKoh0i+x NQjSh6D3XyxgxmsUyvGLatIZkhZCfXS8475IV97Gc5Vfy7dT2sOFy8LpCPnlKDb7viLF jNVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=DFuU/GlMC6lQPcoshiYpVskyGQA8Ldr6x1l/JL9ti+Y=; b=D3s7ErJhBtW+G2TRrLFAFON+7J3Doh+6U57OYNrDZXRWGT0ZwXOAdr3XkdAL9nQSVS wzaqYKxs43kde35xaR4oUAE1y4DqQQzxL1shkgIBGFRqeAX9mbxwd0TM3Hv9YTf+tGXH Wkx7x8dxVo5XzB44PZDRQXqER47SflEKTbA+U0Rm+4AZI202ErDjlnOEQbC+rGJG2TOu gt10BPBXvJH7otGCkV8nUQBRbi/mdJ0c/AahbhSGMI2PS1kAR0D1uCD3Hwz5q13Ev6u4 d46gXBGV5gnmTAraidUaRN/+Ed4VQ4u01zAY1eR59Edi1xSG9cfwF+QD6Iy6MJAo3m22 Jq1Q== 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 l1si4534161pfg.217.2017.05.18.01.33.11; Thu, 18 May 2017 01:33:11 -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 S1755374AbdERIdI (ORCPT + 25 others); Thu, 18 May 2017 04:33:08 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:51199 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755107AbdERIdF (ORCPT ); Thu, 18 May 2017 04:33:05 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M7sMi-1dxiik1PUm-00vQax; Thu, 18 May 2017 10:32:46 +0200 From: Arnd Bergmann To: Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Kevin Barnett , Scott Benesh , Scott Teel , esc.storagedev@microsemi.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: smartpqi: mark PM functions as __maybe_unused Date: Thu, 18 May 2017 10:32:18 +0200 Message-Id: <20170518083243.2927102-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UzfLyfjwhqmZqp+bc6Qicok4TV3A6pVODTvAgJ1qZDw9U6EL6CS SX1TeykXaXvxgAK6ECHX2fvZJNxVws7ytDGFbcS+XBu4tCzP5SKg3yR6cGPB9emsaktEMBV K6Su6b8qi8ihDLcT20wPHUy0CfAihi36qcYK4Dc0ZHNrGfF0UZIj+vEUWIXuvjodGmFAY+N LTNoD9il8pzEhWIws4z2A== X-UI-Out-Filterresults: notjunk:1; V01:K0:XD8b0UKabYg=:F1/MhbcWRrIedmo0PuhEtc PQ27RbCdFqY2wFiyjQpLgmwQyWt9CFdIXV3lUIRyC071pM8MvJKdP0M9SbTWO64MRD5WOKWhv xcrkUlmbROda6YMv6ZEJD9X1P4jfPw5S8tbYkGRLfJAuma4dmnftGFCJnnS1mHK13Gnz1Zv7Z 6W4yO+/YUP05Z6caZ7Sz+I+CkeIJFDCOuZ0JTDmNb4sgosB+TPn7NIHrVcx57QnGY3/UNvCLe GxQjm2hZl558UiwVgalJAz0MB6l4y/AUYbDxddglvXAP+7kaMNEaoUUonVIWyTzip7w6TliLP oKdEEWYMaRLIZSrJxirqc65J08C2lPicXfeKTo77XaYGYS/lVe/m9We3ns7vde/L6nMT5ylfm g0ep9pNo+h5ubDe3tlJusZlfamu0UyqRfeVLEqxjugQxFo8mj8/dKtC3JVhonULF/AEQQd6xQ o1t3ylPpFoYhRJ2/ac1gVfWVvjq3VCfZv7ZIDsgRUA1AyTd5pBPyCPsWX+OAXufBl+lIG4WDC W4ayO2o7jpwmwrYUHL/ql3cpHahlezTA/aeaWW3EqR6+TGU+8wxBKFsA7e2Dugb377U0nWeOl YmSN67jl/d9WZKlh2/6z3KBMKkScO9PNjUPMGoRv6xXKT9ugwpFpIFREUR7rQuazO/koOqmbj 7PUC3bmFshcq/ZR1brKoyEstWdztzlclz9e5usL8WzeDo0qAnkyOKlVyI9AuVSr5S2/M= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added suspend/resume support causes harmless warnings when CONFIG_PM is disabled: smartpqi/smartpqi_init.c:5147:12: error: 'pqi_ctrl_wait_for_pending_io' defined but not used [-Werror=unused-function] smartpqi/smartpqi_init.c:2019:13: error: 'pqi_wait_until_lun_reset_finished' defined but not used [-Werror=unused-function] smartpqi/smartpqi_init.c:2013:13: error: 'pqi_wait_until_scan_finished' defined but not used [-Werror=unused-function] We can avoid the warnings by removing the #ifdef around the handlers and instead marking them as __maybe_unused, which will let gcc drop the unused code silently. Fixes: f44d210312a6 ("scsi: smartpqi: add suspend and resume support") Signed-off-by: Arnd Bergmann --- drivers/scsi/smartpqi/smartpqi_init.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 0b11ae7e96dc..cb8f886e705c 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -6213,8 +6213,6 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) return 0; } -#if defined(CONFIG_PM) - static void pqi_reinit_queues(struct pqi_ctrl_info *ctrl_info) { unsigned int i; @@ -6321,8 +6319,6 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info) return 0; } -#endif /* CONFIG_PM */ - static inline int pqi_set_pcie_completion_timeout(struct pci_dev *pci_dev, u16 timeout) { @@ -6696,9 +6692,7 @@ static void pqi_process_module_params(void) pqi_process_lockup_action_param(); } -#if defined(CONFIG_PM) - -static int pqi_suspend(struct pci_dev *pci_dev, pm_message_t state) +static __maybe_unused int pqi_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct pqi_ctrl_info *ctrl_info; @@ -6728,7 +6722,7 @@ static int pqi_suspend(struct pci_dev *pci_dev, pm_message_t state) return 0; } -static int pqi_resume(struct pci_dev *pci_dev) +static __maybe_unused int pqi_resume(struct pci_dev *pci_dev) { int rc; struct pqi_ctrl_info *ctrl_info; @@ -6759,8 +6753,6 @@ static int pqi_resume(struct pci_dev *pci_dev) return pqi_ctrl_init_resume(ctrl_info); } -#endif /* CONFIG_PM */ - /* Define the PCI IDs for the controllers that we support. */ static const struct pci_device_id pqi_pci_id_table[] = { {