| Message ID | 20230801083244.165392-1-zhouscd@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] USB: gadget: Fix the function name error in sourcesink/loopback. | expand |
On Tue, Aug 01, 2023 at 01:32:45AM -0700, chengdong zhou wrote: > Change function name from "source/sink" to "sourcesink". > Keep the usb_function_driver.name consistent with usb_function.name > for sourcesink and loopback. > Cleaned up some code to decouple the sourcesink and loopback. > > If usb_function.name and usb_function_driver.name are not the same, > it will cause the function to be unable to be exported to userspace > by the USB config file system. > > Signed-off-by: chengdong zhou <zhouscd@gmail.com> > --- > drivers/usb/gadget/function/f_loopback.c | 13 +---------- > drivers/usb/gadget/function/f_sourcesink.c | 25 ++-------------------- > drivers/usb/gadget/function/g_zero.h | 3 --- > drivers/usb/gadget/legacy/zero.c | 6 +++--- > 4 files changed, 6 insertions(+), 41 deletions(-) > > diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c > index ae41f556eb75..45f542b5ff55 100644 > --- a/drivers/usb/gadget/function/f_loopback.c > +++ b/drivers/usb/gadget/function/f_loopback.c > @@ -583,16 +583,5 @@ static struct usb_function_instance *loopback_alloc_instance(void) > > return &lb_opts->func_inst; > } > -DECLARE_USB_FUNCTION(Loopback, loopback_alloc_instance, loopback_alloc); > - > -int __init lb_modinit(void) > -{ > - return usb_function_register(&Loopbackusb_func); > -} > - > -void __exit lb_modexit(void) > -{ > - usb_function_unregister(&Loopbackusb_func); > -} > - > +DECLARE_USB_FUNCTION_INIT(loopback, loopback_alloc_instance, loopback_alloc); > MODULE_LICENSE("GPL"); > diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c > index 6803cd60cc6d..f6d1c095aa2c 100644 > --- a/drivers/usb/gadget/function/f_sourcesink.c > +++ b/drivers/usb/gadget/function/f_sourcesink.c > @@ -858,7 +858,7 @@ static struct usb_function *source_sink_alloc_func( > ss->bulk_qlen = ss_opts->bulk_qlen; > ss->iso_qlen = ss_opts->iso_qlen; > > - ss->function.name = "source/sink"; > + ss->function.name = "sourcesink"; > ss->function.bind = sourcesink_bind; > ss->function.set_alt = sourcesink_set_alt; > ss->function.get_alt = sourcesink_get_alt; > @@ -1263,27 +1263,6 @@ static struct usb_function_instance *source_sink_alloc_inst(void) > > return &ss_opts->func_inst; > } > -DECLARE_USB_FUNCTION(SourceSink, source_sink_alloc_inst, > +DECLARE_USB_FUNCTION_INIT(sourcesink, source_sink_alloc_inst, > source_sink_alloc_func); > - > -static int __init sslb_modinit(void) > -{ > - int ret; > - > - ret = usb_function_register(&SourceSinkusb_func); > - if (ret) > - return ret; > - ret = lb_modinit(); > - if (ret) > - usb_function_unregister(&SourceSinkusb_func); > - return ret; > -} > -static void __exit sslb_modexit(void) > -{ > - usb_function_unregister(&SourceSinkusb_func); > - lb_modexit(); > -} > -module_init(sslb_modinit); > -module_exit(sslb_modexit); > - > MODULE_LICENSE("GPL"); > diff --git a/drivers/usb/gadget/function/g_zero.h b/drivers/usb/gadget/function/g_zero.h > index 98b8462ad538..c1ea28526c73 100644 > --- a/drivers/usb/gadget/function/g_zero.h > +++ b/drivers/usb/gadget/function/g_zero.h > @@ -62,9 +62,6 @@ struct f_lb_opts { > int refcnt; > }; > > -void lb_modexit(void); > -int lb_modinit(void); > - > /* common utilities */ > void disable_endpoints(struct usb_composite_dev *cdev, > struct usb_ep *in, struct usb_ep *out, > diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c > index 23312a07efb4..0cddd20e54ff 100644 > --- a/drivers/usb/gadget/legacy/zero.c > +++ b/drivers/usb/gadget/legacy/zero.c > @@ -222,7 +222,7 @@ static int ss_config_setup(struct usb_configuration *c, > } > > static struct usb_configuration sourcesink_driver = { > - .label = "source/sink", > + .label = "sourcesink", > .setup = ss_config_setup, > .bConfigurationValue = 3, > .bmAttributes = USB_CONFIG_ATT_SELFPOWER, > @@ -282,7 +282,7 @@ static int zero_bind(struct usb_composite_dev *cdev) > autoresume_cdev = cdev; > timer_setup(&autoresume_timer, zero_autoresume, 0); > > - func_inst_ss = usb_get_function_instance("SourceSink"); > + func_inst_ss = usb_get_function_instance("sourcesink"); > if (IS_ERR(func_inst_ss)) > return PTR_ERR(func_inst_ss); > > @@ -302,7 +302,7 @@ static int zero_bind(struct usb_composite_dev *cdev) > goto err_put_func_inst_ss; > } > > - func_inst_lb = usb_get_function_instance("Loopback"); > + func_inst_lb = usb_get_function_instance("loopback"); > if (IS_ERR(func_inst_lb)) { > status = PTR_ERR(func_inst_lb); > goto err_put_func_ss; > -- > 2.25.1 > Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - Your patch did many different things all at once, making it difficult to review. All Linux kernel patches need to only do one thing at a time. If you need to do multiple things (such as clean up all coding style issues in a file/driver), do it in a sequence of patches, each one doing only one thing. This will make it easier to review the patches to ensure that they are correct, and to help alleviate any merge issues that larger patches can cause. - You did not specify a description of why the patch is needed, or possibly, any description at all, in the email body. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what is needed in order to properly describe the change. - This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what needs to be done here to properly describe this. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot
On Tue, Aug 01, 2023 at 01:32:45AM -0700, chengdong zhou wrote:
> Change function name from "source/sink" to "sourcesink".
But why?
thanks,
greg k-h
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c index ae41f556eb75..45f542b5ff55 100644 --- a/drivers/usb/gadget/function/f_loopback.c +++ b/drivers/usb/gadget/function/f_loopback.c @@ -583,16 +583,5 @@ static struct usb_function_instance *loopback_alloc_instance(void) return &lb_opts->func_inst; } -DECLARE_USB_FUNCTION(Loopback, loopback_alloc_instance, loopback_alloc); - -int __init lb_modinit(void) -{ - return usb_function_register(&Loopbackusb_func); -} - -void __exit lb_modexit(void) -{ - usb_function_unregister(&Loopbackusb_func); -} - +DECLARE_USB_FUNCTION_INIT(loopback, loopback_alloc_instance, loopback_alloc); MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c index 6803cd60cc6d..f6d1c095aa2c 100644 --- a/drivers/usb/gadget/function/f_sourcesink.c +++ b/drivers/usb/gadget/function/f_sourcesink.c @@ -858,7 +858,7 @@ static struct usb_function *source_sink_alloc_func( ss->bulk_qlen = ss_opts->bulk_qlen; ss->iso_qlen = ss_opts->iso_qlen; - ss->function.name = "source/sink"; + ss->function.name = "sourcesink"; ss->function.bind = sourcesink_bind; ss->function.set_alt = sourcesink_set_alt; ss->function.get_alt = sourcesink_get_alt; @@ -1263,27 +1263,6 @@ static struct usb_function_instance *source_sink_alloc_inst(void) return &ss_opts->func_inst; } -DECLARE_USB_FUNCTION(SourceSink, source_sink_alloc_inst, +DECLARE_USB_FUNCTION_INIT(sourcesink, source_sink_alloc_inst, source_sink_alloc_func); - -static int __init sslb_modinit(void) -{ - int ret; - - ret = usb_function_register(&SourceSinkusb_func); - if (ret) - return ret; - ret = lb_modinit(); - if (ret) - usb_function_unregister(&SourceSinkusb_func); - return ret; -} -static void __exit sslb_modexit(void) -{ - usb_function_unregister(&SourceSinkusb_func); - lb_modexit(); -} -module_init(sslb_modinit); -module_exit(sslb_modexit); - MODULE_LICENSE("GPL"); diff --git a/drivers/usb/gadget/function/g_zero.h b/drivers/usb/gadget/function/g_zero.h index 98b8462ad538..c1ea28526c73 100644 --- a/drivers/usb/gadget/function/g_zero.h +++ b/drivers/usb/gadget/function/g_zero.h @@ -62,9 +62,6 @@ struct f_lb_opts { int refcnt; }; -void lb_modexit(void); -int lb_modinit(void); - /* common utilities */ void disable_endpoints(struct usb_composite_dev *cdev, struct usb_ep *in, struct usb_ep *out, diff --git a/drivers/usb/gadget/legacy/zero.c b/drivers/usb/gadget/legacy/zero.c index 23312a07efb4..0cddd20e54ff 100644 --- a/drivers/usb/gadget/legacy/zero.c +++ b/drivers/usb/gadget/legacy/zero.c @@ -222,7 +222,7 @@ static int ss_config_setup(struct usb_configuration *c, } static struct usb_configuration sourcesink_driver = { - .label = "source/sink", + .label = "sourcesink", .setup = ss_config_setup, .bConfigurationValue = 3, .bmAttributes = USB_CONFIG_ATT_SELFPOWER, @@ -282,7 +282,7 @@ static int zero_bind(struct usb_composite_dev *cdev) autoresume_cdev = cdev; timer_setup(&autoresume_timer, zero_autoresume, 0); - func_inst_ss = usb_get_function_instance("SourceSink"); + func_inst_ss = usb_get_function_instance("sourcesink"); if (IS_ERR(func_inst_ss)) return PTR_ERR(func_inst_ss); @@ -302,7 +302,7 @@ static int zero_bind(struct usb_composite_dev *cdev) goto err_put_func_inst_ss; } - func_inst_lb = usb_get_function_instance("Loopback"); + func_inst_lb = usb_get_function_instance("loopback"); if (IS_ERR(func_inst_lb)) { status = PTR_ERR(func_inst_lb); goto err_put_func_ss;
Change function name from "source/sink" to "sourcesink". Keep the usb_function_driver.name consistent with usb_function.name for sourcesink and loopback. Cleaned up some code to decouple the sourcesink and loopback. If usb_function.name and usb_function_driver.name are not the same, it will cause the function to be unable to be exported to userspace by the USB config file system. Signed-off-by: chengdong zhou <zhouscd@gmail.com> --- drivers/usb/gadget/function/f_loopback.c | 13 +---------- drivers/usb/gadget/function/f_sourcesink.c | 25 ++-------------------- drivers/usb/gadget/function/g_zero.h | 3 --- drivers/usb/gadget/legacy/zero.c | 6 +++--- 4 files changed, 6 insertions(+), 41 deletions(-)