| From e6bab2b66329b40462fb1bed6f98bc3fcf543a1c Mon Sep 17 00:00:00 2001 |
| From: Michael Tretter <m.tretter@pengutronix.de> |
| Date: Sun, 17 Oct 2021 23:50:13 +0200 |
| Subject: usb: gadget: uvc: rename function to be more consistent |
| |
| From: Michael Tretter <m.tretter@pengutronix.de> |
| |
| commit e6bab2b66329b40462fb1bed6f98bc3fcf543a1c upstream. |
| |
| When enabling info debugging for the uvc gadget, the bind and unbind |
| infos use different formats. Change the unbind to visually match the |
| bind. |
| |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> |
| Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> |
| Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> |
| Link: https://lore.kernel.org/r/20211017215017.18392-3-m.grzeschik@pengutronix.de |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/usb/gadget/function/f_uvc.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/usb/gadget/function/f_uvc.c |
| +++ b/drivers/usb/gadget/function/f_uvc.c |
| @@ -883,12 +883,13 @@ static void uvc_free(struct usb_function |
| kfree(uvc); |
| } |
| |
| -static void uvc_unbind(struct usb_configuration *c, struct usb_function *f) |
| +static void uvc_function_unbind(struct usb_configuration *c, |
| + struct usb_function *f) |
| { |
| struct usb_composite_dev *cdev = c->cdev; |
| struct uvc_device *uvc = to_uvc(f); |
| |
| - uvcg_info(f, "%s\n", __func__); |
| + uvcg_info(f, "%s()\n", __func__); |
| |
| device_remove_file(&uvc->vdev.dev, &dev_attr_function_name); |
| video_unregister_device(&uvc->vdev); |
| @@ -942,7 +943,7 @@ static struct usb_function *uvc_alloc(st |
| /* Register the function. */ |
| uvc->func.name = "uvc"; |
| uvc->func.bind = uvc_function_bind; |
| - uvc->func.unbind = uvc_unbind; |
| + uvc->func.unbind = uvc_function_unbind; |
| uvc->func.get_alt = uvc_function_get_alt; |
| uvc->func.set_alt = uvc_function_set_alt; |
| uvc->func.disable = uvc_function_disable; |