From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754558AbcCBPeG (ORCPT ); Wed, 2 Mar 2016 10:34:06 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:28835 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752567AbcCBPeF (ORCPT ); Wed, 2 Mar 2016 10:34:05 -0500 Subject: Re: [PATCH 3/6] usb: ohci-at91: use __maybe_unused to hide pm functions To: Arnd Bergmann , Greg Kroah-Hartman References: <1456932255-71725-1-git-send-email-arnd@arndb.de> <1456932255-71725-4-git-send-email-arnd@arndb.de> CC: Felipe Balbi , , , Alan Stern , From: Nicolas Ferre Organization: atmel Message-ID: <56D707F4.9030903@atmel.com> Date: Wed, 2 Mar 2016 16:34:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1456932255-71725-4-git-send-email-arnd@arndb.de> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 02/03/2016 16:24, Arnd Bergmann a écrit : > 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 Acked-by: Nicolas Ferre Thanks Arnd, bye. > --- > 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); > -- Nicolas Ferre