| Message ID | 20230818124025.51576-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ae257611573cde279d31be3961a59e255f567fb0 |
| Headers | show |
| Series | [-next] usb: gadget: function: Remove unused declarations | expand |
Hi, Nice catches! You probably want 4 separate patches. In particular... W dniu 18.08.2023 o 14:40, Yue Haibing pisze: > These declarations are not implemented anymore, remove them. > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> > --- > drivers/usb/gadget/function/u_phonet.h | 1 - > drivers/usb/gadget/function/u_serial.h | 4 ---- > drivers/usb/gadget/function/uvc.h | 2 -- > 3 files changed, 7 deletions(-) > > diff --git a/drivers/usb/gadget/function/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h > index c53233b37192..ff62ca22c40d 100644 > --- a/drivers/usb/gadget/function/u_phonet.h > +++ b/drivers/usb/gadget/function/u_phonet.h > @@ -20,7 +20,6 @@ struct f_phonet_opts { > struct net_device *gphonet_setup_default(void); > void gphonet_set_gadget(struct net_device *net, struct usb_gadget *g); > int gphonet_register_netdev(struct net_device *net); > -int phonet_bind_config(struct usb_configuration *c, struct net_device *dev); ...this fixes 0383070e8d904f006b6eaffceb3fae4cdd25c01a > void gphonet_cleanup(struct net_device *dev); > > #endif /* __U_PHONET_H */ > diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h > index 102a7323a1fd..901d99310bc4 100644 > --- a/drivers/usb/gadget/function/u_serial.h > +++ b/drivers/usb/gadget/function/u_serial.h > @@ -71,8 +71,4 @@ void gserial_disconnect(struct gserial *); > void gserial_suspend(struct gserial *p); > void gserial_resume(struct gserial *p); > > -/* functions are bound to configurations by a config or gadget driver */ > -int gser_bind_config(struct usb_configuration *c, u8 port_num); ... this fixes 9786b4561228099f579ad88912aa305812526ea1 > -int obex_bind_config(struct usb_configuration *c, u8 port_num); ... and this fixes 9b2252cace741e4843983d77ead80c3cf1d74e20 > - > #endif /* __U_SERIAL_H */ > diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h > index 100475b1363e..6751de8b63ad 100644 > --- a/drivers/usb/gadget/function/uvc.h > +++ b/drivers/usb/gadget/function/uvc.h > @@ -178,8 +178,6 @@ struct uvc_file_handle { > */ > > extern void uvc_function_setup_continue(struct uvc_device *uvc); > -extern void uvc_endpoint_stream(struct uvc_device *dev); > - @Laurent: I was unable to track this one. Regards, Andrzej > extern void uvc_function_connect(struct uvc_device *uvc); > extern void uvc_function_disconnect(struct uvc_device *uvc); >
On Fri, Sep 08, 2023 at 03:33:29PM +0200, Andrzej Pietrasiewicz wrote: > Hi, > > Nice catches! > > You probably want 4 separate patches. In particular... > > W dniu 18.08.2023 o 14:40, Yue Haibing pisze: > > These declarations are not implemented anymore, remove them. > > > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> > > --- > > drivers/usb/gadget/function/u_phonet.h | 1 - > > drivers/usb/gadget/function/u_serial.h | 4 ---- > > drivers/usb/gadget/function/uvc.h | 2 -- > > 3 files changed, 7 deletions(-) > > > > diff --git a/drivers/usb/gadget/function/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h > > index c53233b37192..ff62ca22c40d 100644 > > --- a/drivers/usb/gadget/function/u_phonet.h > > +++ b/drivers/usb/gadget/function/u_phonet.h > > @@ -20,7 +20,6 @@ struct f_phonet_opts { > > struct net_device *gphonet_setup_default(void); > > void gphonet_set_gadget(struct net_device *net, struct usb_gadget *g); > > int gphonet_register_netdev(struct net_device *net); > > -int phonet_bind_config(struct usb_configuration *c, struct net_device *dev); > > ...this fixes 0383070e8d904f006b6eaffceb3fae4cdd25c01a > > > void gphonet_cleanup(struct net_device *dev); > > > > #endif /* __U_PHONET_H */ > > diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h > > index 102a7323a1fd..901d99310bc4 100644 > > --- a/drivers/usb/gadget/function/u_serial.h > > +++ b/drivers/usb/gadget/function/u_serial.h > > @@ -71,8 +71,4 @@ void gserial_disconnect(struct gserial *); > > void gserial_suspend(struct gserial *p); > > void gserial_resume(struct gserial *p); > > > > -/* functions are bound to configurations by a config or gadget driver */ > > -int gser_bind_config(struct usb_configuration *c, u8 port_num); > > ... this fixes 9786b4561228099f579ad88912aa305812526ea1 > > > -int obex_bind_config(struct usb_configuration *c, u8 port_num); > > ... and this fixes 9b2252cace741e4843983d77ead80c3cf1d74e20 > > - > > #endif /* __U_SERIAL_H */ > > diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h > > index 100475b1363e..6751de8b63ad 100644 > > --- a/drivers/usb/gadget/function/uvc.h > > +++ b/drivers/usb/gadget/function/uvc.h > > @@ -178,8 +178,6 @@ struct uvc_file_handle { > > */ > > > > extern void uvc_function_setup_continue(struct uvc_device *uvc); > > -extern void uvc_endpoint_stream(struct uvc_device *dev); > > - > > @Laurent: I was unable to track this one. The issue has been there from the start. It doesn't matter much though, this patch has been merged already. > > extern void uvc_function_connect(struct uvc_device *uvc); > > extern void uvc_function_disconnect(struct uvc_device *uvc); > >
diff --git a/drivers/usb/gadget/function/u_phonet.h b/drivers/usb/gadget/function/u_phonet.h index c53233b37192..ff62ca22c40d 100644 --- a/drivers/usb/gadget/function/u_phonet.h +++ b/drivers/usb/gadget/function/u_phonet.h @@ -20,7 +20,6 @@ struct f_phonet_opts { struct net_device *gphonet_setup_default(void); void gphonet_set_gadget(struct net_device *net, struct usb_gadget *g); int gphonet_register_netdev(struct net_device *net); -int phonet_bind_config(struct usb_configuration *c, struct net_device *dev); void gphonet_cleanup(struct net_device *dev); #endif /* __U_PHONET_H */ diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h index 102a7323a1fd..901d99310bc4 100644 --- a/drivers/usb/gadget/function/u_serial.h +++ b/drivers/usb/gadget/function/u_serial.h @@ -71,8 +71,4 @@ void gserial_disconnect(struct gserial *); void gserial_suspend(struct gserial *p); void gserial_resume(struct gserial *p); -/* functions are bound to configurations by a config or gadget driver */ -int gser_bind_config(struct usb_configuration *c, u8 port_num); -int obex_bind_config(struct usb_configuration *c, u8 port_num); - #endif /* __U_SERIAL_H */ diff --git a/drivers/usb/gadget/function/uvc.h b/drivers/usb/gadget/function/uvc.h index 100475b1363e..6751de8b63ad 100644 --- a/drivers/usb/gadget/function/uvc.h +++ b/drivers/usb/gadget/function/uvc.h @@ -178,8 +178,6 @@ struct uvc_file_handle { */ extern void uvc_function_setup_continue(struct uvc_device *uvc); -extern void uvc_endpoint_stream(struct uvc_device *dev); - extern void uvc_function_connect(struct uvc_device *uvc); extern void uvc_function_disconnect(struct uvc_device *uvc);
These declarations are not implemented anymore, remove them. Signed-off-by: Yue Haibing <yuehaibing@huawei.com> --- drivers/usb/gadget/function/u_phonet.h | 1 - drivers/usb/gadget/function/u_serial.h | 4 ---- drivers/usb/gadget/function/uvc.h | 2 -- 3 files changed, 7 deletions(-)