[libcamera-devel] ipa: rkisp1: Drop unnecessary forward declarations and includes
diff mbox series

Message ID 20220720130740.15300-1-laurent.pinchart@ideasonboard.com
State Accepted
Commit cf66dee4accca7607b6c9d4461060af5275147a9
Headers show
Series
  • [libcamera-devel] ipa: rkisp1: Drop unnecessary forward declarations and includes
Related show

Commit Message

Laurent Pinchart July 20, 2022, 1:07 p.m. UTC
Forward declarations of IPACameraSensorInfo and inclusion of
linux/rkisp1-config.h are not needed in headers that use them only for
arguments to functions defined by the Algorithm base class, as inclusion
of algorithm.h will bring the necessary declarations for function
arguments. Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/rkisp1/algorithms/agc.h | 2 --
 src/ipa/rkisp1/algorithms/awb.h | 2 --
 src/ipa/rkisp1/algorithms/blc.h | 4 ----
 3 files changed, 8 deletions(-)


base-commit: 8b02645845bf404fba83910818b285b652f14f89

Comments

Florian Sylvestre July 20, 2022, 3:29 p.m. UTC | #1
Hi Laurent,

On Wed, 20 Jul 2022 at 15:08, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Forward declarations of IPACameraSensorInfo and inclusion of
> linux/rkisp1-config.h are not needed in headers that use them only for
> arguments to functions defined by the Algorithm base class, as inclusion
> of algorithm.h will bring the necessary declarations for function
> arguments. Drop them.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/rkisp1/algorithms/agc.h | 2 --
>  src/ipa/rkisp1/algorithms/awb.h | 2 --
>  src/ipa/rkisp1/algorithms/blc.h | 4 ----
>  3 files changed, 8 deletions(-)
>
> diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h
> index 22c02779d311..1c9818b7db2a 100644
> --- a/src/ipa/rkisp1/algorithms/agc.h
> +++ b/src/ipa/rkisp1/algorithms/agc.h
> @@ -17,8 +17,6 @@
>
>  namespace libcamera {
>
> -struct IPACameraSensorInfo;
> -
>  namespace ipa::rkisp1::algorithms {
>
>  class Agc : public Algorithm
> diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h
> index 7647842f6609..667a8beb7689 100644
> --- a/src/ipa/rkisp1/algorithms/awb.h
> +++ b/src/ipa/rkisp1/algorithms/awb.h
> @@ -7,8 +7,6 @@
>
>  #pragma once
>
> -#include <linux/rkisp1-config.h>
> -
>  #include "algorithm.h"
>
>  namespace libcamera {
> diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h
> index c2649dd7736e..5fc3a80fb638 100644
> --- a/src/ipa/rkisp1/algorithms/blc.h
> +++ b/src/ipa/rkisp1/algorithms/blc.h
> @@ -7,14 +7,10 @@
>
>  #pragma once
>
> -#include <linux/rkisp1-config.h>
> -
>  #include "algorithm.h"
>
>  namespace libcamera {
>
> -struct IPACameraSensorInfo;
> -
>  namespace ipa::rkisp1::algorithms {
>
>  class BlackLevelCorrection : public Algorithm
>
> base-commit: 8b02645845bf404fba83910818b285b652f14f89
> --
> Regards,
>
> Laurent Pinchart
>

Reviewed-by: Florian Sylvestre <fsylvestre@baylibre.com>
Umang Jain July 20, 2022, 4:43 p.m. UTC | #2
Hello,

On 7/20/22 18:37, Laurent Pinchart via libcamera-devel wrote:
> Forward declarations of IPACameraSensorInfo and inclusion of
> linux/rkisp1-config.h are not needed in headers that use them only for
> arguments to functions defined by the Algorithm base class, as inclusion
> of algorithm.h will bring the necessary declarations for function
> arguments. Drop them.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


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

> ---
>   src/ipa/rkisp1/algorithms/agc.h | 2 --
>   src/ipa/rkisp1/algorithms/awb.h | 2 --
>   src/ipa/rkisp1/algorithms/blc.h | 4 ----
>   3 files changed, 8 deletions(-)
>
> diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h
> index 22c02779d311..1c9818b7db2a 100644
> --- a/src/ipa/rkisp1/algorithms/agc.h
> +++ b/src/ipa/rkisp1/algorithms/agc.h
> @@ -17,8 +17,6 @@
>   
>   namespace libcamera {
>   
> -struct IPACameraSensorInfo;
> -
>   namespace ipa::rkisp1::algorithms {
>   
>   class Agc : public Algorithm
> diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h
> index 7647842f6609..667a8beb7689 100644
> --- a/src/ipa/rkisp1/algorithms/awb.h
> +++ b/src/ipa/rkisp1/algorithms/awb.h
> @@ -7,8 +7,6 @@
>   
>   #pragma once
>   
> -#include <linux/rkisp1-config.h>
> -
>   #include "algorithm.h"
>   
>   namespace libcamera {
> diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h
> index c2649dd7736e..5fc3a80fb638 100644
> --- a/src/ipa/rkisp1/algorithms/blc.h
> +++ b/src/ipa/rkisp1/algorithms/blc.h
> @@ -7,14 +7,10 @@
>   
>   #pragma once
>   
> -#include <linux/rkisp1-config.h>
> -
>   #include "algorithm.h"
>   
>   namespace libcamera {
>   
> -struct IPACameraSensorInfo;
> -
>   namespace ipa::rkisp1::algorithms {
>   
>   class BlackLevelCorrection : public Algorithm
>
> base-commit: 8b02645845bf404fba83910818b285b652f14f89

Patch
diff mbox series

diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h
index 22c02779d311..1c9818b7db2a 100644
--- a/src/ipa/rkisp1/algorithms/agc.h
+++ b/src/ipa/rkisp1/algorithms/agc.h
@@ -17,8 +17,6 @@ 
 
 namespace libcamera {
 
-struct IPACameraSensorInfo;
-
 namespace ipa::rkisp1::algorithms {
 
 class Agc : public Algorithm
diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h
index 7647842f6609..667a8beb7689 100644
--- a/src/ipa/rkisp1/algorithms/awb.h
+++ b/src/ipa/rkisp1/algorithms/awb.h
@@ -7,8 +7,6 @@ 
 
 #pragma once
 
-#include <linux/rkisp1-config.h>
-
 #include "algorithm.h"
 
 namespace libcamera {
diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h
index c2649dd7736e..5fc3a80fb638 100644
--- a/src/ipa/rkisp1/algorithms/blc.h
+++ b/src/ipa/rkisp1/algorithms/blc.h
@@ -7,14 +7,10 @@ 
 
 #pragma once
 
-#include <linux/rkisp1-config.h>
-
 #include "algorithm.h"
 
 namespace libcamera {
 
-struct IPACameraSensorInfo;
-
 namespace ipa::rkisp1::algorithms {
 
 class BlackLevelCorrection : public Algorithm