usb: gadget: multi: Mark {cdc,rndis}_config_register() __init
PATCH 1/1 usb: gadget: multi: Mark {cdc,rndis}_config_register() __init
If gcc (e.g. 4.1.2) decides not to inline cdc_config_register() and rndis_config_register(), this will cause section mismatch warnings:
WARNING: drivers/usb/gadget/g_multi.o(.text+0x32f6): Section mismatch in reference from the function cdc_config_register() to the function .init.text:cdc_do_config() The function cdc_config_register() references
the function __init cdc_do_config().
This is often because cdc_config_register lacks a __init
annotation or the annotation of cdc_do_config is wrong.
WARNING: drivers/usb/gadget/g_multi.o(.text+0x3326): Section mismatch in reference from the function rndis_config_register() to the function .init.text:rndis_do_config() The function rndis_config_register() references
the function __init rndis_do_config().
This is often because rndis_config_register lacks a __init
annotation or the annotation of rndis_do_config is wrong.
Fortunately they're harmless, as {cdc,rndis}_config_register() are only called from multi_bind(), which is annotated with __ref.
Mark {cdc,rndis}_config_register() with the __init annotation to kill the warning.
---
Note: I did not verify that multi_bind() is rightfully marked __ref.
drivers/usb/gadget/multi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/gadget/multi.c +4 -4
@@ -177,7 +177,7 @@ err_func_acm:return ret; } -static int rndis_config_register (struct usb_composite_dev *cdev) +static __init int rndis_config_register (struct usb_composite_dev *cdev) {static struct usb_configuration config = { .bConfigurationValue =MULTI_RNDIS_CONFIG_NUM ,
@@ -192,7 +192,7 @@ static int rndis_config_register(struct usb_composite_dev *cdev)#else -static int rndis_config_register (struct usb_composite_dev *cdev) +static __init int rndis_config_register (struct usb_composite_dev *cdev) {return 0 ; }
@@ -240,7 +240,7 @@ err_func_acm:return ret; } -static int cdc_config_register (struct usb_composite_dev *cdev) +static __init int cdc_config_register (struct usb_composite_dev *cdev) {static struct usb_configuration config = { .bConfigurationValue =MULTI_CDC_CONFIG_NUM ,
@@ -255,7 +255,7 @@ static int cdc_config_register(struct usb_composite_dev *cdev)#else -static int cdc_config_register (struct usb_composite_dev *cdev) +static __init int cdc_config_register (struct usb_composite_dev *cdev) {return 0 ; }
Signature · 1 line
1.7.0.4
Quoted 15 lines · Geert Uytterhoeven
If gcc (e.g. 4.1.2) decides not to inline
cdc_config_register()andrndis_config_register(), this will cause section mismatch warnings:WARNING: drivers/usb/gadget/g_multi.o(.text+0x32f6): Section mismatch in reference from the function
cdc_config_register()to the function .init.text:cdc_do_config() The functioncdc_config_register()references
the function__initcdc_do_config().
This is often becausecdc_config_registerlacks a__init
annotation or the annotation ofcdc_do_configis wrong.WARNING: drivers/usb/gadget/g_multi.o(.text+0x3326): Section mismatch in reference from the function
rndis_config_register()to the function .init.text:rndis_do_config() The functionrndis_config_register()references
the function__initrndis_do_config().
This is often becauserndis_config_registerlacks a__init
annotation or the annotation ofrndis_do_configis wrong.
Quoted 7 lines
Fortunately they're harmless, as {cdc,rndis}_config_register() are only called from
multi_bind(), which is annotated with__ref.Mark {cdc,rndis}_config_register() with the
__initannotation to kill the warning.Signed-off-by Geert Uytterhoeven <[email protected]>
With transition to configfs all those __inits and __refs will probably go away in the long term though.
Quoted 2 lines
---
Note: I did not verify thatmulti_bind()is rightfully marked__ref.
It should be. It's only referenced in multi_driver object as a bind callback which is called by composite_bind() which is referenced in composite_driver_template as bind callback which is called by usb_gadget_probe_driver() which is called by usb_composite_probe() which is called by multi_init() which is __init and called as module_init.
Signature · 4 lines
Best regards, _ _ .o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o ..o | Computer Science, Michał “mina86” Nazarewicz (o o) ooo +----<email/xmpp: [email protected]>--------------ooO--(_)--Ooo--
Quoted 22 lines · Michal Nazarewicz
Quoted 21 lines · Geert Uytterhoeven
If gcc (e.g. 4.1.2) decides not to inline
cdc_config_register()andrndis_config_register(), this will cause section mismatch warnings:WARNING: drivers/usb/gadget/g_multi.o(.text+0x32f6): Section mismatch in reference from the function
cdc_config_register()to the function .init.text:cdc_do_config() The functioncdc_config_register()references
the function__initcdc_do_config().
This is often becausecdc_config_registerlacks a__init
annotation or the annotation ofcdc_do_configis wrong.WARNING: drivers/usb/gadget/g_multi.o(.text+0x3326): Section mismatch in reference from the function
rndis_config_register()to the function .init.text:rndis_do_config() The functionrndis_config_register()references
the function__initrndis_do_config().
This is often becauserndis_config_registerlacks a__init
annotation or the annotation ofrndis_do_configis wrong.Fortunately they're harmless, as {cdc,rndis}_config_register() are only called from
multi_bind(), which is annotated with__ref.Mark {cdc,rndis}_config_register() with the
__initannotation to kill the warning.
Quoted 6 lines
Quoted 1 line
Signed-off-by Geert Uytterhoeven <[email protected]>With transition to configfs all those
__initsand__refswill probably go away in the long term though.
that's what I thought. Wouldn't it be better to remove them all already?
Signature · 1 line
balbi