From patchwork Wed Mar 2 15:24:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102627 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2443645lbc; Wed, 2 Mar 2016 07:25:41 -0800 (PST) X-Received: by 10.98.42.207 with SMTP id q198mr39867443pfq.103.1456932341485; Wed, 02 Mar 2016 07:25:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qx12si35739960pab.169.2016.03.02.07.25.40; Wed, 02 Mar 2016 07:25:41 -0800 (PST) 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 S1755043AbcCBPZd (ORCPT + 30 others); Wed, 2 Mar 2016 10:25:33 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:53011 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752702AbcCBPZa (ORCPT ); Wed, 2 Mar 2016 10:25:30 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0Lmyuu-1Zyncj3IxY-00h37c; Wed, 02 Mar 2016 16:24:57 +0100 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 4/6] usb: ehci-atmel: use __maybe_unused to hide pm functions Date: Wed, 2 Mar 2016 16:24:06 +0100 Message-Id: <1456932255-71725-5-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:gA9CN4XiZlE2R4HSVYPdVMKs94ba2bZbcVHSiPtJsHWxm/mLcdB n1OF9RTLsLFQdnAUQ2sELCldJlLJSYdcpzN+JC6Y/tjewsPjMZmhimVVjbGx35ic1kBsWnK d2+hrUlzD4fQP39pf0i5x0JzDN99ZsznQ94x915PdNOe9y6cjJQ90dMyr+gKYU/oD9LImDs cwUIZxecpZsnm9ZEGPhOA== X-UI-Out-Filterresults: notjunk:1; V01:K0:grY2XBchSvM=:pSx+aGLXaut6kyaVSYOMIR 2LYZlw+k4cqCfn4SMNm2OFPXUDrgHw2RrZJ7YD0e6k5+v2tkoZ94XqWy+r58bBADfE/FqnewI Q4vxLBgl3O20HU4qAZw9N67zauG7DfU4maXFo2ziYhGUukhZvnIVRlCsnlt9XGz8c+yAP4hFa nBxbLzyPTAgZEG0CYjdgR9s2+nt2eScArP4DMqDBKQHBzCRtWiSrE+Qyb7hZvNORU1iZGBnp3 kA9Tpwn9C9J66Fpyr4nf/65bme6bG49hm/r9CFLLU5fri2PX0NwOcits+C9SxrX1jJPYxtLGE t5w9jfvgR8qrBGwxYqYef9wkOhBJckm6RbVy7u3agWj+inT6V4MQBrK2Z6NqZTcdkTFVsG3bV rUS9yfEbmTF/KDc4EaGPDwyr5Cp0fmxzL8zWrUul/1/klYEv9ZktO8LvBDrn7Sa2lt22eRhZp +39zoQut7a6NpRfqUjcK0pMIHyC8d/AwX/t5kCfRUFm90ncmQy1kDJryEkFPSwYPUCAohLrt1 JhDx3yWAOUiE9DqQu6c+WD0MyMpdcqN642BUP1znIIkI70lTWjhdMNut1I/eusv18dGMHBoYo 6KRTy3l7UeIoYJFZdPWHXvv8hvo1vQEcaW/VILLaHMgiKNUcQoQ7TrMRcLjRzOMTFIxxNsejA rcClZJDgwbdS3PHkmzAxr/2K3oMer0jkVpy+cax9+JhAdco+x/BnTyTUlG0ZTvoRXdD4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ehci-atmel 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/ehci-atmel.c:189:12: error: 'ehci_atmel_drv_suspend' defined but not used [-Werror=unused-function] drivers/usb/host/ehci-atmel.c:203:12: error: 'ehci_atmel_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/ehci-atmel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.7.0 diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index be0964a801e8..7440722bfbf0 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -185,8 +185,7 @@ static int ehci_atmel_drv_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int ehci_atmel_drv_suspend(struct device *dev) +static int __maybe_unused ehci_atmel_drv_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct atmel_ehci_priv *atmel_ehci = hcd_to_atmel_ehci_priv(hcd); @@ -200,7 +199,7 @@ static int ehci_atmel_drv_suspend(struct device *dev) return 0; } -static int ehci_atmel_drv_resume(struct device *dev) +static int __maybe_unused ehci_atmel_drv_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct atmel_ehci_priv *atmel_ehci = hcd_to_atmel_ehci_priv(hcd); @@ -208,7 +207,6 @@ static int ehci_atmel_drv_resume(struct device *dev) atmel_start_clock(atmel_ehci); return ehci_resume(hcd, false); } -#endif #ifdef CONFIG_OF static const struct of_device_id atmel_ehci_dt_ids[] = {