Commit e6bab2b6 authored by Michael Tretter's avatar Michael Tretter Committed by Greg Kroah-Hartman
Browse files

usb: gadget: uvc: rename function to be more consistent 



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarPaul Elder <paul.elder@ideasonboard.com>
Signed-off-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20211017215017.18392-3-m.grzeschik@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 859c675d

drivers/usb/gadget/function/f_uvc.c

+4 −3
Original line number Diff line number Diff line
@@ -884,12 +884,13 @@ static void uvc_free(struct usb_function *f) 
	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);
@@ -943,7 +944,7 @@ static struct usb_function *uvc_alloc(struct usb_function_instance *fi) 
	/* 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;