Skip to contentSkip to conversation

usb: musb: mark PM functions as __maybe_unused

PATCH In review Arnd Bergmann 3 participants 5 messages Nov 22, 2016 – Nov 28, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/usb/musb/musb_core.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/usb/musb/musb_core.c +5 -12
index c3e172e15ec3..cc8192f1f2af 100644
@@ -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,
Signature · 1 line
2.9.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Arnd Bergmann

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:

#2 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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")

linux-m68k-allmodconfig$ bloat-o-meter drivers/usb/musb/musb_core.o{.orig,} add/remove: 8/0 grow/shrink: 0/0 up/down: 2344/0 (2344)

function                                     old     new   delta
musb_restore_context                           -     892    +892
musb_save_context                              -     690    +690
musb_run_resume_work                           -     190    +190
musb_resume                                    -     182    +182
musb_runtime_resume                            -     148    +148
musb_suspend                                   -     114    +114
musb_dev_pm_ops                                -      92     +92
musb_runtime_suspend                           -      36     +36

Total: Before=13091, After=15435, chg +17.91%

Doh...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw
Quoted 22 lines · CET Geert Uytterhoeven
Quoted 9 lines · Arnd Bergmann

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")

linux-m68k-allmodconfig$ bloat-o-meter drivers/usb/musb/musb_core.o{.orig,} add/remove: 8/0 grow/shrink: 0/0 up/down: 2344/0 (2344)

function                                     old     new   delta
musb_restore_context                           -     892    +892
musb_save_context                              -     690    +690
musb_run_resume_work                           -     190    +190
musb_resume                                    -     182    +182
musb_runtime_resume                            -     148    +148
musb_suspend                                   -     114    +114
musb_dev_pm_ops                                -      92     +92
musb_runtime_suspend                           -      36     +36
Quoted 1 line

Total: Before=13091, After=15435, chg +17.91%

Well, in allmodconfig, you have CONFIG_PM enabled, so this is not dead code but actually does what was intended (though possibly not written as efficiently as it could have been).

In a configuration without CONFIG_PM, there should ideally be no added code.

Arnd

#4 lore raw

Hi Arnd,

Quoted 25 lines · Arnd Bergmann
Quoted 22 lines · CET Geert Uytterhoeven
Quoted 9 lines · Arnd Bergmann

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")

linux-m68k-allmodconfig$ bloat-o-meter drivers/usb/musb/musb_core.o{.orig,} add/remove: 8/0 grow/shrink: 0/0 up/down: 2344/0 (2344)

function                                     old     new   delta
musb_restore_context                           -     892    +892
musb_save_context                              -     690    +690
musb_run_resume_work                           -     190    +190
musb_resume                                    -     182    +182
musb_runtime_resume                            -     148    +148
musb_suspend                                   -     114    +114
musb_dev_pm_ops                                -      92     +92
musb_runtime_suspend                           -      36     +36
Quoted 1 line

Total: Before=13091, After=15435, chg +17.91%

Quoted 3 lines

Well, in allmodconfig, you have CONFIG_PM enabled, so this is not dead code but actually does what was intended (though possibly not written as efficiently as it could have been).

M68k does not have CONFIG_PM.

Quoted 2 lines

In a configuration without CONFIG_PM, there should ideally be no added code.

Apparently not :-(

BTW, same result for allyesconfig.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds