From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754889AbcCBPZ0 (ORCPT ); Wed, 2 Mar 2016 10:25:26 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:57143 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754792AbcCBPZV (ORCPT ); Wed, 2 Mar 2016 10:25:21 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, Felipe Balbi , Alan Stern , linux-usb@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 3/6] usb: ohci-at91: use __maybe_unused to hide pm functions Date: Wed, 2 Mar 2016 16:24:05 +0100 Message-Id: <1456932255-71725-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456932255-71725-1-git-send-email-arnd@arndb.de> References: <1456932255-71725-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:C8d8Wuw0ugRdR7jyDIMPrTHs8diPMYwvKUFE9RXw5+RDjGyZrF8 l4aagpVYyiaZUoF6lc2tSNEJgODMMcJVaqgL5WdRVjnfIxhuNwTxtwnNt9G9AAKYPFkKEc8 023iTyRH8NtyUErB4J5bAGm2yoaKlVRbJlNxSG1mdsskj0+UZd72ICQLoA0jn1MpN5jhg89 SZfm9Z5ob6PRL8KGSJdLw== X-UI-Out-Filterresults: notjunk:1;V01:K0:3QMBR+nCjcg=:EzDjO/BQUiu1OWaVeewyGh tmbh2mkIPvoa+JHnA4llBm5/mSbiEgBjsSfB7UANLFZWoVEQwuklUmN/PVfK8+W+vGeEDRdMi qVkAm1qSbNJ5TNZu2IPCoPDLs/AxQ9ArNDAy7RLU6UwKLb4j5G990xrYz6o6AioZUsAon3c0a lRWBCALffFLr8o60w5FHFBTnbis+2cWG5rq/cI3DVGnjMSyyHfnH5HIpdunpMExH6GjbXh3Q8 QaUc2cbJ7AhEeduiQWM+CxG1bhyQzwXvqPIBEVNQG2c8tvjBHC7vCwyuMrbGT+4mmMhkXQszF TRQihsNeFU5cOvIXiMoyYzSpHKIIZfw75IpdHOrARlREAVS/FWWFIcExbSnDJAy40z4SMXVwW iufpcxlUX3dUuwcjyWv55Dav8CADiNhmf1o+5qL0T12QuoguwxpwYZn8+0pWwNE5CGwlBWsko fUifaY45nUkMvJflYkfJYa3mfxpjOQzMpYwimnBo/PBfezwIDa9vmDcd310qnLvwrMV94QpU8 eyrJBOhxN7BMh8+v0/qWIc1IGTEElaWkVqhIv6gV3cqAlQmCOX3JeFNJWZW8Nxhddkkhg2sB0 WHujFSCOrmDE2aHdx3zRluw/kKvDclIvD8hfRCUDqgTzWjPH/xsA2DX5J3c3BinFdQEyRorAF Xh9iXBa1VhzQZZkd/rmvCLV98/qHbpzeJ9pVZgu1+WONtKaAj5zenyUh94n5svGtUes4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ohci-at91 driver uses #ifdef to check for CONFIG_PM, but then uses SIMPLE_DEV_PM_OPS, which leaves the references out when CONFIG_PM_SLEEP is not defined, so we get a warning with PM=y && PM_SLEEP=n: drivers/usb/host/ohci-at91.c:587:1: error: 'ohci_hcd_at91_drv_suspend' defined but not used [-Werror=unused-function] drivers/usb/host/ohci-at91.c:631:12: error: 'ohci_hcd_at91_drv_resume' defined but not used [-Werror=unused-function] This removes the incorrect #ifdef and instead uses a __maybe_unused annotation to let the compiler know it can silently drop the function definition. Signed-off-by: Arnd Bergmann --- drivers/usb/host/ohci-at91.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 95c8ddde0725..d177372bb357 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -581,9 +581,7 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM - -static int +static int __maybe_unused ohci_hcd_at91_drv_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); @@ -628,7 +626,8 @@ ohci_hcd_at91_drv_suspend(struct device *dev) return ret; } -static int ohci_hcd_at91_drv_resume(struct device *dev) +static int __maybe_unused +ohci_hcd_at91_drv_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct ohci_at91_priv *ohci_at91 = hcd_to_ohci_at91_priv(hcd); @@ -641,7 +640,6 @@ static int ohci_hcd_at91_drv_resume(struct device *dev) ohci_resume(hcd, false); return 0; } -#endif static SIMPLE_DEV_PM_OPS(ohci_hcd_at91_pm_ops, ohci_hcd_at91_drv_suspend, ohci_hcd_at91_drv_resume); -- 2.7.0