Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20970d82 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: gadget: uvc: Move trace parameter to function module 



The trace module parameter controls output of debugging messages in the
UVC function driver. Move it from the webcam module to the UVC function
module where it belongs. This allows ConfigFS-based UVC gadgets to
control tracing.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 284eb166

drivers/usb/gadget/function/f_uvc.c

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include "uvc_video.h"



unsigned int uvc_gadget_trace_param;

module_param_named(trace, uvc_gadget_trace_param, uint, 0644);

MODULE_PARM_DESC(trace, "Trace level bitmask");



/* --------------------------------------------------------------------------

 * Function descriptors

drivers/usb/gadget/function/u_uvc.h

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


struct f_uvc_opts {

	struct usb_function_instance			func_inst;

	unsigned int					uvc_gadget_trace_param;

	unsigned int					streaming_interval;

	unsigned int					streaming_maxpacket;

	unsigned int					streaming_maxburst;
@@ -81,7 +80,4 @@ struct f_uvc_opts { 
	int				refcnt;

};



void uvc_set_trace_param(unsigned int trace);



#endif /* U_UVC_H */

drivers/usb/gadget/legacy/webcam.c

+0 −4
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ static unsigned int streaming_maxburst; 
module_param(streaming_maxburst, uint, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(streaming_maxburst, "0 - 15 (ss only)");



static unsigned int trace;

module_param(trace, uint, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(trace, "Trace level bitmask");

/* --------------------------------------------------------------------------

 * Device descriptor

 */
@@ -379,7 +376,6 @@ webcam_bind(struct usb_composite_dev *cdev) 
	uvc_opts->streaming_interval = streaming_interval;

	uvc_opts->streaming_maxpacket = streaming_maxpacket;

	uvc_opts->streaming_maxburst = streaming_maxburst;

	uvc_set_trace_param(trace);



	uvc_opts->fs_control = uvc_fs_control_cls;

	uvc_opts->ss_control = uvc_ss_control_cls;