From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 04/15] media: atomisp: get rid of ifdef nonsense
Date: Wed, 3 Jun 2020 09:00:50 +0200 [thread overview]
Message-ID: <82d6e2b75e5dba3c44ee379f62f299a617a02f4e.1591167358.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1591167358.git.mchehab+huawei@kernel.org>
There are some ifdefs there that end doing the same thing.
Get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
.../atomisp/pci/isp2400_input_system_local.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
index 58ea58ba56e4..4b7034e4adb4 100644
--- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
@@ -21,15 +21,14 @@
#include "input_system_global.h"
#include "input_system_defs.h" /* HIVE_ISYS_GPREG_MULTICAST_A_IDX,... */
-#include "css_receiver_2400_defs.h" /* _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX, _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,... */
-#if defined(IS_ISP_2400_MAMOIADA_SYSTEM)
+
+/*
+ * _HRT_CSS_RECEIVER_2400_TWO_PIXEL_EN_REG_IDX, * _HRT_CSS_RECEIVER_2400_CSI2_FUNC_PROG_REG_IDX,...
+ */
+#include "css_receiver_2400_defs.h"
+
#include "isp_capture_defs.h"
-#elif defined(IS_ISP_2401_MAMOIADA_SYSTEM)
-/* Same name, but keep the distinction,it is a different device */
-#include "isp_capture_defs.h"
-#else
-#error "input_system_local.h: 2400_SYSTEM must be one of {2400, 2401 }"
-#endif
+
#include "isp_acquisition_defs.h"
#include "input_system_ctrl_defs.h"
--
2.26.2
next prev parent reply other threads:[~2020-06-03 7:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-03 7:00 [PATCH 00/15] More atomisp fixes and cleanups Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 01/15] media: atomisp: improve IRQ handling debug messages Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 02/15] media: atomisp: do some cleanup at irq_local.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 03/15] media: atomisp: get rid of a duplicated file Mauro Carvalho Chehab
2020-06-03 7:00 ` Mauro Carvalho Chehab [this message]
2020-06-03 7:00 ` [PATCH 05/15] media: atomisp: simplify IRQ ifdef logic Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 06/15] media: atomisp: remove some unused defines from *mamoiada_params.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 07/15] media: atomisp: use just one mamoiada_params.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 08/15] media: atomisp: get rid of a detection hack for a BYT Andorid-based tablet Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 09/15] media: atomisp: don't set hpll_freq twice with different values Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 10/15] media: atomisp: use macros from intel-family.h Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 11/15] media: atomisp: change the detection of ISP2401 at runtime Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 12/15] media: atomisp: use different dfs failed messages Mauro Carvalho Chehab
2020-06-03 7:00 ` [PATCH 13/15] media: atomisp: set DFS to MAX if sensor doesn't report fps Mauro Carvalho Chehab
2020-06-03 7:01 ` [PATCH 14/15] media: atomisp: use strscpy() instead of less secure variants Mauro Carvalho Chehab
2020-06-03 7:01 ` [PATCH 15/15] media: atomisp: get rid of a string_support.h abstraction layer Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=82d6e2b75e5dba3c44ee379f62f299a617a02f4e.1591167358.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).