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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 54f04d3218296a0da9090c39c6ccaa035d66b2bf..1d2feac5c532fd805b91c2722c763daccc877c85 100644 (file)
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -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

diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
index a6fdde6b162b0882094b9dcbc870a4f3704442d6..2ed292e94fbc37f013ac95130ed3b1b940a714b5 100644 (file)
--- a/drivers/usb/gadget/function/u_uvc.h
+++ b/drivers/usb/gadget/function/u_uvc.h
@@ -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 */
-

diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index 6b86568c9157be04a8715d6074d8587f90374f22..a9f8eb8e1c767ce961762e8fcf22112bcf41d221 100644 (file)
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -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;