treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157

[sfrench/cifs-2.6.git] / include / media / v4l2-ctrls.h

diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index e5cae37ced2df4d0e024296156767fe92a17b6e8..bfa2a4527040d570b15ae3d3a683029d7a29fa60 100644 (file)
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -1,17 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *  V4L2 controls support header.
  *
  *  Copyright (C) 2010  Hans Verkuil <hverkuil@xs4all.nl>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
  */
 
 #ifndef _V4L2_CTRLS_H
@@ -23,10 +14,11 @@
 #include <media/media-request.h>
 
 /*
- * Include the mpeg2 stateless codec compound control definitions.
+ * Include the mpeg2 and fwht stateless codec compound control definitions.
  * This will move to the public headers once this API is fully stable.
  */
 #include <media/mpeg2-ctrls.h>
+#include <media/fwht-ctrls.h>
 
 /* forward references */
 struct file;
@@ -49,6 +41,7 @@ struct poll_table_struct;
  * @p_char:                    Pointer to a string.
  * @p_mpeg2_slice_params:      Pointer to a MPEG2 slice parameters structure.
  * @p_mpeg2_quantization:      Pointer to a MPEG2 quantization data structure.
+ * @p_fwht_params:             Pointer to a FWHT stateless parameters structure.
  * @p:                         Pointer to a compound value.
  */
 union v4l2_ctrl_ptr {
@@ -60,6 +53,7 @@ union v4l2_ctrl_ptr {
        char *p_char;
        struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;
        struct v4l2_ctrl_mpeg2_quantization *p_mpeg2_quantization;
+       struct v4l2_ctrl_fwht_params *p_fwht_params;
        void *p;
 };
 
@@ -934,7 +928,7 @@ s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
  * __v4l2_ctrl_s_ctrl() - Unlocked variant of v4l2_ctrl_s_ctrl().
  *
  * @ctrl:      The control.
- * @val:       TheControls name new value.
+ * @val:       The new value.
  *
  * This sets the control's new value safely by going through the control
  * framework. This function assumes the control's handler is already locked,
@@ -1039,7 +1033,7 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s);
  *
  * @ctrl:      The control.
  * @s:         The new string.
- *Controls name
+ *
  * This sets the control's new string safely by going through the control
  * framework. This function will lock the control's handler, so it cannot be
  * used from within the &v4l2_ctrl_ops functions.
@@ -1127,7 +1121,7 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait);
  * applying control values in a request is only applicable to memory-to-memory
  * devices.
  */
-void v4l2_ctrl_request_setup(struct media_request *req,
+int v4l2_ctrl_request_setup(struct media_request *req,
                             struct v4l2_ctrl_handler *parent);
 
 /**