From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Sun, 14 Nov 2021 11:44:37 +0000 (+0000)
Subject: media: atomisp: ia_css_stream.h: remove ifdefs from the header
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55e14acd99fd1ae3f624cdf75ec6ffe163007c81;p=uclinux-h8%2Flinux.git

media: atomisp: ia_css_stream.h: remove ifdefs from the header

Now that the input system always declare rx_cfg_t, we can
remove the ifdef ISP2401 from this header.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/staging/media/atomisp/pci/ia_css_stream.h b/drivers/staging/media/atomisp/pci/ia_css_stream.h
index 70b0378748f1..cf847586dc61 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_stream.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_stream.h
@@ -18,9 +18,7 @@
 
 #include <type_support.h>
 #include <system_local.h>
-#if !defined(ISP2401)
 #include <input_system.h>
-#endif
 #include "ia_css_types.h"
 #include "ia_css_stream_public.h"
 
@@ -30,9 +28,7 @@
 struct ia_css_stream {
 	struct ia_css_stream_config    config;
 	struct ia_css_stream_info      info;
-#if !defined(ISP2401)
 	rx_cfg_t                       csi_rx_config;
-#endif
 	bool                           reconfigure_css_rx;
 	struct ia_css_pipe            *last_pipe;
 	int                            num_pipes;