From patchwork Tue Nov 22 14:30:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101472 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2125014qge; Tue, 22 Nov 2016 06:30:48 -0800 (PST) X-Received: by 10.84.172.131 with SMTP id n3mr198491plb.5.1479825048697; Tue, 22 Nov 2016 06:30:48 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 31si104993plk.146.2016.11.22.06.30.48; Tue, 22 Nov 2016 06:30:48 -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 S933552AbcKVOap (ORCPT + 26 others); Tue, 22 Nov 2016 09:30:45 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:61314 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932982AbcKVOao (ORCPT ); Tue, 22 Nov 2016 09:30:44 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mhqzr-1cN8D600t1-00MtNS; Tue, 22 Nov 2016 15:30:31 +0100 From: Arnd Bergmann To: Bin Liu , Greg Kroah-Hartman Cc: Arnd Bergmann , Tony Lindgren , Felipe Balbi , Johan Hovold , Rasmus Villemoes , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: musb: mark PM functions as __maybe_unused Date: Tue, 22 Nov 2016 15:30:15 +0100 Message-Id: <20161122143028.1822041-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:w96NxHcewrunhNm+mGY835bQRyaQXgr0P2+s7KHZhRgC2dLD9GI l1nMY51MTrymrs3jmiw3YOppK9+ThOHqxPTUI5nM+PR9ZwZpaa3wd5t4IvcAjEahKvQ3p0n CSegJ/Ho0SAVKGXVYwMoCLGVk4MVF6qZNkx3bOYSGSWUb5uH56NVXoMc9YE8gpcTcE6t2X5 N2rN3Fb9zoAQHBcp1+csA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+DzODl0baOc=:A7vC33xHDJ4ZvLNGcxYjFi ZAETGC6jVcFNZqaAPj3yTCdkAx3yOTZHlSpRw6nGXzAH4NKTGGdZ+slmF2+7OGOgV0jvub3v3 Jgj3aV25IGKF5bTCC7mvB6d0essWLUe+VHDQZ5AeDMlOsPmRztUyEysUFzoAzgOqnd4d5LjSS Tr+IrHoAhRcAcSeEhuZSsqSWAkAEh4qOKQNc0/iOkSGt/cqPxV8aa5hYrmWY1e0DQeyObX2un iQ9IrY1PatRpm9ML7jYmeCeDJqbhwyWWlpNjTi9fGVHg4W/dsQ48+/PXpFexRO25JvcDwbeFD SdAAeWEwR8zPh3xNx22xpSDCuNS3lUCP5Pe7bz5tiMImMNaACVEPLPerJrcq7Naly1uU1OeL0 7GBvcS/6IFAi5Tf9LAmpMF+QYFg8UgUYU/IC+YICRGhccYIpZ9gflvx5cg6loQrxFGcP9q6N9 tRNm4hxeuBvMkAzplBYzXXCXPrQZKtUbM+LdTgmCDF6EVmSxAleFEOPAV0ygiRwpUbpKYggSr 10KqRVAvBkIT/+INvm3Un9bcrI8wbZbM2tF3B1J2SyPRRT/a1NAJKv0yrz9Ka2zOBHoZ6i+dx guMPd/aPhOIOM6cbUZ3EJmhLoRca0xfn1h+zeZrKNg0KsrB+nZwrcg9KXslwlLNz960Ut6IM2 7gblDogkgJn3jbitG94VFAT/gOS4HPtBfMRQJmZfLBTnLQ73JnzyVHGClpYPWKGh+DAm3QzY0 dNgpo5AIldcMvF5P Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building without CONFIG_PM causes a harmless warning: drivers/usb/musb/musb_core.c:2041:12: error: ‘musb_run_resume_work’ defined but not used [-Werror=unused-function] Removing the #ifdef around the PM code and instead marking the suspend/resume functions as __maybe_unused will do the right thing without warning. Fixes: ea2f35c01d5e ("usb: musb: Fix sleeping function called from invalid context for hdrc glue") Signed-off-by: Arnd Bergmann --- drivers/usb/musb/musb_core.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) -- 2.9.0 diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index c3e172e15ec3..cc8192f1f2af 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2485,8 +2485,6 @@ static int musb_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM - static void musb_save_context(struct musb *musb) { int i; @@ -2640,7 +2638,7 @@ static void musb_restore_context(struct musb *musb) musb_writeb(musb_base, MUSB_INDEX, musb->context.index); } -static int musb_suspend(struct device *dev) +static int __maybe_unused musb_suspend(struct device *dev) { struct musb *musb = dev_to_musb(dev); unsigned long flags; @@ -2667,7 +2665,7 @@ static int musb_suspend(struct device *dev) return 0; } -static int musb_resume(struct device *dev) +static int __maybe_unused musb_resume(struct device *dev) { struct musb *musb = dev_to_musb(dev); unsigned long flags; @@ -2717,7 +2715,7 @@ static int musb_resume(struct device *dev) return 0; } -static int musb_runtime_suspend(struct device *dev) +static int __maybe_unused musb_runtime_suspend(struct device *dev) { struct musb *musb = dev_to_musb(dev); @@ -2727,7 +2725,7 @@ static int musb_runtime_suspend(struct device *dev) return 0; } -static int musb_runtime_resume(struct device *dev) +static int __maybe_unused musb_runtime_resume(struct device *dev) { struct musb *musb = dev_to_musb(dev); unsigned long flags; @@ -2771,16 +2769,11 @@ static const struct dev_pm_ops musb_dev_pm_ops = { .runtime_resume = musb_runtime_resume, }; -#define MUSB_DEV_PM_OPS (&musb_dev_pm_ops) -#else -#define MUSB_DEV_PM_OPS NULL -#endif - static struct platform_driver musb_driver = { .driver = { .name = (char *)musb_driver_name, .bus = &platform_bus_type, - .pm = MUSB_DEV_PM_OPS, + .pm = &musb_dev_pm_ops, }, .probe = musb_probe, .remove = musb_remove,