Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1527569 > unrolled thread

[PATCH] usb: musb: mark PM functions as __maybe_unused

Back to article view | Back to linux.kernel

Contents

  [PATCH] usb: musb: mark PM functions as __maybe_unused Arnd Bergmann <arnd@arndb.de> - 2016-11-22 15:40 +0100
    Re: [PATCH] usb: musb: mark PM functions as __maybe_unused Tony Lindgren <tony@atomide.com> - 2016-11-23 15:30 +0100

#1527569 — [PATCH] usb: musb: mark PM functions as __maybe_unused

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 <arnd@arndb.de>
---
 drivers/usb/musb/musb_core.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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,
-- 
2.9.0

[toc] | [next] | [standalone]

#1528439

* Arnd Bergmann <arnd@arndb.de> [161122 06:30]:
> 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.

OK works for me:

Acked-by: Tony Lindgren <tony@atomide.com>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web