| Message ID | 20220316192010.19001-8-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 393dcd1f2b75e50783c805814a96bf6c8e11fe03 |
| Headers | show |
| Series | treewide: eliminate anonymous module_init & module_exit | expand |
On 3/16/22 1:20 PM, Randy Dunlap wrote: > Eliminate anonymous module_init() and module_exit(), which can lead to > confusion or ambiguity when reading System.map, crashes/oops/bugs, > or an initcall_debug log. > > Give each of these init and exit functions unique driver-specific > names to eliminate the anonymous names. > > Example 1: (System.map) > ffffffff832fc78c t init > ffffffff832fc79e t init > ffffffff832fc8f8 t init > > Example 2: (initcall_debug log) > calling init+0x0/0x12 @ 1 > initcall init+0x0/0x12 returned 0 after 15 usecs > calling init+0x0/0x60 @ 1 > initcall init+0x0/0x60 returned 0 after 2 usecs > calling init+0x0/0x9a @ 1 > initcall init+0x0/0x9a returned 0 after 74 usecs > > Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Krzysztof Opasiak <k.opasiak@samsung.com> > Cc: Igor Kotrasinski <i.kotrasinsk@samsung.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Valentina Manea <valentina.manea.m@gmail.com> > Cc: Shuah Khan <shuah@kernel.org> > Cc: Shuah Khan <skhan@linuxfoundation.org> > Cc: linux-usb@vger.kernel.org > --- > drivers/usb/usbip/vudc_main.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- lnx-517-rc8.orig/drivers/usb/usbip/vudc_main.c > +++ lnx-517-rc8/drivers/usb/usbip/vudc_main.c > @@ -28,7 +28,7 @@ static struct platform_driver vudc_drive > > static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); > > -static int __init init(void) > +static int __init vudc_init(void) > { > int retval = -ENOMEM; > int i; > @@ -86,9 +86,9 @@ cleanup: > out: > return retval; > } > -module_init(init); > +module_init(vudc_init); > > -static void __exit cleanup(void) > +static void __exit vudc_cleanup(void) > { > struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; > > @@ -103,7 +103,7 @@ static void __exit cleanup(void) > } > platform_driver_unregister(&vudc_driver); > } > -module_exit(cleanup); > +module_exit(vudc_cleanup); > > MODULE_DESCRIPTION("USB over IP Device Controller"); > MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); > Thanks for fixing this. Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
--- lnx-517-rc8.orig/drivers/usb/usbip/vudc_main.c +++ lnx-517-rc8/drivers/usb/usbip/vudc_main.c @@ -28,7 +28,7 @@ static struct platform_driver vudc_drive static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); -static int __init init(void) +static int __init vudc_init(void) { int retval = -ENOMEM; int i; @@ -86,9 +86,9 @@ cleanup: out: return retval; } -module_init(init); +module_init(vudc_init); -static void __exit cleanup(void) +static void __exit vudc_cleanup(void) { struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; @@ -103,7 +103,7 @@ static void __exit cleanup(void) } platform_driver_unregister(&vudc_driver); } -module_exit(cleanup); +module_exit(vudc_cleanup); MODULE_DESCRIPTION("USB over IP Device Controller"); MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski");
Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log. Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names. Example 1: (System.map) ffffffff832fc78c t init ffffffff832fc79e t init ffffffff832fc8f8 t init Example 2: (initcall_debug log) calling init+0x0/0x12 @ 1 initcall init+0x0/0x12 returned 0 after 15 usecs calling init+0x0/0x60 @ 1 initcall init+0x0/0x60 returned 0 after 2 usecs calling init+0x0/0x9a @ 1 initcall init+0x0/0x9a returned 0 after 74 usecs Fixes: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Krzysztof Opasiak <k.opasiak@samsung.com> Cc: Igor Kotrasinski <i.kotrasinsk@samsung.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Valentina Manea <valentina.manea.m@gmail.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Shuah Khan <skhan@linuxfoundation.org> Cc: linux-usb@vger.kernel.org --- drivers/usb/usbip/vudc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)