From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163138AbdDUVoV (ORCPT ); Fri, 21 Apr 2017 17:44:21 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63284 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161736AbdDUVoQ (ORCPT ); Fri, 21 Apr 2017 17:44:16 -0400 From: Arnd Bergmann To: Mathias Nyman , Greg Kroah-Hartman Cc: Arnd Bergmann , Yoshihiro Shimoda , Felipe Balbi , Heikki Krogerus , Guenter Roeck , Baolin Wang , Lu Baolu , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: host: xhci: remove #ifdef around PM functions Date: Fri, 21 Apr 2017 23:42:54 +0200 Message-Id: <20170421214321.1868547-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:j4QAe3q3N06hf6YHmWS3iOw4VExoPh2T1YY5muliwafiONfwhA/ bG8SmR6iP/k1wi5jBWTfXHHUcgwrKBCyM05EYzQf2YAdY6o5PAKIpv99qiAK0oMKgsZ4Mr/ Y+cgYg2vHNCD3a0/AhugfXcjS0h/itPGW3yBZDAasbK3AKlLg5MTYRsLiCQ4j270ztZF5UZ CopssWjVrhum+Hyt+fwWw== X-UI-Out-Filterresults: notjunk:1;V01:K0:xsynqecygeY=:3+6RA/7EnYgOq3q60C3vml 2hWMYP2eDCn4HrCACSUhyqUvu/U3M4R7dg1eC3LAhKebbAbxsCi9bffQbwnhsDpmug84439zy G/yHTYmo2ri3OGpcA0pp7ZVeu25RFdiITdx6alJwNOni6C2hbr8BOxZNmVcRwNvDfqRiTSCKe tCc32tU4t4QNOuEppFU4tzm7Q7nSFLlJgnc9iloMd8Z0XCd9eiZARsZ9BY44HwVSqTCwY56lZ xwqyXLLQCiCc/nFEhKzW9XPXLYiHQtZb5crVGLY5Sqtu/RcyXnUcyf4D9UGq3Wcj/D+aseOSm Za+i28f7sUE4ybhh7KgywqkfaP7yesrBXy17/vyG0JxKNTHl3HDmLf/D5CkfmRbyB8fq31L7l y+NijPBkQe8HmbJlK92e7ImK2+9EJaqhdeEsgJ5skiP7KYBfJSB7qaPr4fAQZdMCsYiGhxFUt otWyih6rZ1UmKZ3foARWKcja4XTEfrOxpbNq7k8bCdu+AsuwjZIwr2cTTTs75JXX6f746Zk05 EbeyKwxZ0ily/0xpSGJUe5NG/kdgtbMGGUC3aikaKN8JaXD+aAOZw0eB1Fr4xGjs13Vz8h1E0 jT5nxkkthoiWlrp/xhcCwsEmTm9YFpyZygBbnJHCH3sc5/5zih9hfPNtNukkHDO+CKXT4HbaI 5ZVnZPyL+gWK2z8Qc6S2l8enLBCr2UFpG8DjFfmMj4BJP5tx5su2tbGEamtjHDkrQYr4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The #ifdef is slightly wrong as it doesn't cover the xhci_priv_resume_quirk() function, causing a harmless warning: drivers/usb/host/xhci-plat.c:58:12: error: 'xhci_priv_resume_quirk' defined but not used [-Werror=unused-function] static int xhci_priv_resume_quirk(struct usb_hcd *hcd) A simpler way to do this correctly is to use __maybe_unused annotations that let the compiler silently drop the functions when there is no reference. Fixes: b0c69b4bace3 ("usb: host: plat: Enable xHCI plat runtime PM") Signed-off-by: Arnd Bergmann --- drivers/usb/host/xhci-plat.c | 12 ++++-------- drivers/usb/host/xhci.h | 5 ----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 057571fab599..7c2a9e7c8e0f 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -355,8 +355,7 @@ static int xhci_plat_remove(struct platform_device *dev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int xhci_plat_suspend(struct device *dev) +static int __maybe_unused xhci_plat_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -378,7 +377,7 @@ static int xhci_plat_suspend(struct device *dev) return ret; } -static int xhci_plat_resume(struct device *dev) +static int __maybe_unused xhci_plat_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -393,10 +392,8 @@ static int xhci_plat_resume(struct device *dev) return xhci_resume(xhci, 0); } -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_PM -static int xhci_plat_runtime_suspend(struct device *dev) +static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -404,14 +401,13 @@ static int xhci_plat_runtime_suspend(struct device *dev) return xhci_suspend(xhci, true); } -static int xhci_plat_runtime_resume(struct device *dev) +static int __maybe_unused xhci_plat_runtime_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); return xhci_resume(xhci, 0); } -#endif /* CONFIG_PM */ static const struct dev_pm_ops xhci_plat_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index cae8fb901aa8..73a28a986d5e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -2004,13 +2004,8 @@ void xhci_init_driver(struct hc_driver *drv, int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command, u32 slot_id); -#ifdef CONFIG_PM int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup); int xhci_resume(struct xhci_hcd *xhci, bool hibernated); -#else -#define xhci_suspend NULL -#define xhci_resume NULL -#endif irqreturn_t xhci_irq(struct usb_hcd *hcd); irqreturn_t xhci_msi_irq(int irq, void *hcd); -- 2.9.0