From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linuxarm@huawei.com, mauro.chehab@huawei.com,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Martiros Shakhzadyan <vrzh@vrzh.net>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-staging@lists.linux.dev
Subject: [PATCH 08/23] media: atomisp: drop an useless #ifdef ISP2401
Date: Tue, 16 Nov 2021 11:28:49 +0000 [thread overview]
Message-ID: <2ee0cc013a060a634fefbd75f4ea1179dd57eb66.1637061474.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1637061474.git.mchehab+huawei@kernel.org>
The Yocto Aero driver for ISP2401 sets my_css_save.loaded_fw.
As we're using the same firmware, remove the ifdef there.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
To mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/23] at: https://lore.kernel.org/all/cover.1637061474.git.mchehab+huawei@kernel.org/
drivers/staging/media/atomisp/pci/sh_css.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 3aa4f8bc39c4..51dbd4e495d0 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1742,9 +1742,8 @@ ia_css_init(struct device *dev, const struct ia_css_env *env,
return err;
}
fw_explicitly_loaded = false;
-#ifndef ISP2401
+
my_css_save.loaded_fw = (struct ia_css_fw *)fw;
-#endif
}
if (!sh_css_setup_spctrl_config(&sh_css_sp_fw, SP_PROG_NAME, &spctrl_cfg))
return -EINVAL;
--
2.33.1
next prev parent reply other threads:[~2021-11-16 11:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 11:28 [PATCH 00/23] Make the code closer to candrpv_0415 firmware Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 01/23] media: atomisp: get rid of phys event abstractions Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 02/23] media: atomisp: get rid of if CONFIG_ON_FRAME_ENQUEUE Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 03/23] media: atomisp: shift some structs from input_system_local Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 04/23] media: atomisp: ia_css_stream.h: remove ifdefs from the header Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 05/23] media: atomisp: fix comments coding style at sh_css.c Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 06/23] media: atomisp: Avoid some {} just to define new vars Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 07/23] media: atomisp: drop two vars that are currently ignored Mauro Carvalho Chehab
2021-11-16 11:28 ` Mauro Carvalho Chehab [this message]
2021-11-16 11:28 ` [PATCH 09/23] media: atomisp: remove #ifdef HAS_OUTPUT_SYSTEM Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 10/23] media: atomisp: drop #ifdef SH_CSS_ENABLE_PER_FRAME_PARAMS Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 11/23] media: atomisp: drop #ifdef WITH_PC_MONITORING Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 12/23] media: atomisp: remove #ifdef SH_CSS_ENABLE_METADATA Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 13/23] media: atomisp: solve #ifdef HAS_NO_PACKED_RAW_PIXELS Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 14/23] media: atomisp: drop crop code at stream create function Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 15/23] media: atomisp: get rid of ia_css_stream_load() Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 16/23] media: atomisp: unify ia_css_stream stop logic Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 17/23] media: atomisp: drop ia_css_pipe_update_qos_ext_mapped_arg Mauro Carvalho Chehab
2021-11-16 11:28 ` [PATCH 18/23] media: atomisp: drop a dead code Mauro Carvalho Chehab
2021-11-16 11:29 ` [PATCH 19/23] media: atomisp: get rid of some weird warn-suppress logic Mauro Carvalho Chehab
2021-11-16 11:29 ` [PATCH 20/23] media: atomisp: drop check_pipe_resolutions() logic Mauro Carvalho Chehab
2021-11-16 11:29 ` [PATCH 21/23] media: atomisp: warn if mipi de-allocation failed Mauro Carvalho Chehab
2021-11-16 11:29 ` [PATCH 22/23] media: atomisp: make sh_css similar to Intel Aero driver Mauro Carvalho Chehab
2021-11-16 11:29 ` [PATCH 23/23] media: atomisp: get rid of #ifdef ISP_VEC_NELEMS 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=2ee0cc013a060a634fefbd75f4ea1179dd57eb66.1637061474.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linuxarm@huawei.com \
--cc=mauro.chehab@huawei.com \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=vrzh@vrzh.net \
/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
all inboxes | Powered by JetHome®