[libcamera-devel] v4l2: camera_proxy: Fix header include order
diff mbox series

Message ID 20220303110639.3469390-1-kieran.bingham@ideasonboard.com
State Accepted
Headers show
Series
  • [libcamera-devel] v4l2: camera_proxy: Fix header include order
Related show

Commit Message

Kieran Bingham March 3, 2022, 11:06 a.m. UTC
The includes in the v4l2_camera_proxy do not match the code styel
and trigger clang-format changes when running checkstyle.

Update and fix the include order accordingly

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/v4l2/v4l2_camera_proxy.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Note, this might likely only apply on top of the pending V4L2 frame rate
patch.

Comments

Laurent Pinchart March 3, 2022, 11:22 a.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Thu, Mar 03, 2022 at 11:06:39AM +0000, Kieran Bingham wrote:
> The includes in the v4l2_camera_proxy do not match the code styel

They also don't match the coding style.

> and trigger clang-format changes when running checkstyle.
> 
> Update and fix the include order accordingly
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/v4l2/v4l2_camera_proxy.cpp | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> Note, this might likely only apply on top of the pending V4L2 frame rate
> patch.
> 
> 
> diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
> index 493c41c0ad0f..4427ae3302d8 100644
> --- a/src/v4l2/v4l2_camera_proxy.cpp
> +++ b/src/v4l2/v4l2_camera_proxy.cpp
> @@ -10,22 +10,23 @@
>  #include <algorithm>
>  #include <array>
>  #include <errno.h>
> -#include <linux/videodev2.h>
>  #include <numeric>
>  #include <set>
>  #include <string.h>
>  #include <sys/mman.h>
>  #include <unistd.h>
>  
> -#include <libcamera/camera.h>
> -#include <libcamera/controls.h>
> -#include <libcamera/control_ids.h>
> -#include <libcamera/formats.h>
> +#include <linux/videodev2.h>
>  
>  #include <libcamera/base/log.h>
>  #include <libcamera/base/object.h>
>  #include <libcamera/base/utils.h>
>  
> +#include <libcamera/camera.h>
> +#include <libcamera/control_ids.h>
> +#include <libcamera/controls.h>
> +#include <libcamera/formats.h>
> +
>  #include "libcamera/internal/formats.h"
>  
>  #include "v4l2_camera.h"
Umang Jain March 3, 2022, 12:25 p.m. UTC | #2
Hi,


On 3/3/22 16:52, Laurent Pinchart wrote:
> Hi Kieran,
>
> Thank you for the patch.
>
> On Thu, Mar 03, 2022 at 11:06:39AM +0000, Kieran Bingham wrote:
>> The includes in the v4l2_camera_proxy do not match the code styel
> They also don't match the coding style.
>
>> and trigger clang-format changes when running checkstyle.
>>
>> Update and fix the include order accordingly
>>
>> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

>
>> ---
>>   src/v4l2/v4l2_camera_proxy.cpp | 11 ++++++-----
>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> Note, this might likely only apply on top of the pending V4L2 frame rate
>> patch.
>>
>>
>> diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
>> index 493c41c0ad0f..4427ae3302d8 100644
>> --- a/src/v4l2/v4l2_camera_proxy.cpp
>> +++ b/src/v4l2/v4l2_camera_proxy.cpp
>> @@ -10,22 +10,23 @@
>>   #include <algorithm>
>>   #include <array>
>>   #include <errno.h>
>> -#include <linux/videodev2.h>
>>   #include <numeric>
>>   #include <set>
>>   #include <string.h>
>>   #include <sys/mman.h>
>>   #include <unistd.h>
>>   
>> -#include <libcamera/camera.h>
>> -#include <libcamera/controls.h>
>> -#include <libcamera/control_ids.h>
>> -#include <libcamera/formats.h>
>> +#include <linux/videodev2.h>
>>   
>>   #include <libcamera/base/log.h>
>>   #include <libcamera/base/object.h>
>>   #include <libcamera/base/utils.h>
>>   
>> +#include <libcamera/camera.h>
>> +#include <libcamera/control_ids.h>
>> +#include <libcamera/controls.h>
>> +#include <libcamera/formats.h>
>> +
>>   #include "libcamera/internal/formats.h"
>>   
>>   #include "v4l2_camera.h"

Patch
diff mbox series

diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 493c41c0ad0f..4427ae3302d8 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -10,22 +10,23 @@ 
 #include <algorithm>
 #include <array>
 #include <errno.h>
-#include <linux/videodev2.h>
 #include <numeric>
 #include <set>
 #include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <libcamera/camera.h>
-#include <libcamera/controls.h>
-#include <libcamera/control_ids.h>
-#include <libcamera/formats.h>
+#include <linux/videodev2.h>
 
 #include <libcamera/base/log.h>
 #include <libcamera/base/object.h>
 #include <libcamera/base/utils.h>
 
+#include <libcamera/camera.h>
+#include <libcamera/control_ids.h>
+#include <libcamera/controls.h>
+#include <libcamera/formats.h>
+
 #include "libcamera/internal/formats.h"
 
 #include "v4l2_camera.h"