From: Hans Verkuil <hverkuil@xs4all.nl>
To: Martiros Shakhzadyan <vrzh@vrzh.net>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
linux-media@vger.kernel.org
Subject: Re: [PATCHv2 5/8] staging: media: atomisp: Refactor ia_css_stream_load()
Date: Fri, 23 Apr 2021 11:26:24 +0200 [thread overview]
Message-ID: <7edb21ff-23b5-8195-877f-829bf17bf6bb@xs4all.nl> (raw)
In-Reply-To: <20210420150356.579395-1-vrzh@vrzh.net>
On 20/04/2021 17:03, Martiros Shakhzadyan wrote:
> Move the support check to the beginning of the function.
> Change the logic to avoid multiple nesting blocks.
> Move variable assignment outside of the if statement.
> Remove an unnecessary check.
>
> Signed-off-by: Martiros Shakhzadyan <vrzh@vrzh.net>
> ---
> drivers/staging/media/atomisp/pci/sh_css.c | 72 +++++++++++-----------
> 1 file changed, 35 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
> index 4d4f030e0fe0..bd96c4ab04d0 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css.c
> +++ b/drivers/staging/media/atomisp/pci/sh_css.c
> @@ -9615,48 +9615,46 @@ ia_css_stream_get_info(const struct ia_css_stream *stream,
> int
> ia_css_stream_load(struct ia_css_stream *stream)
> {
> - if (!IS_ISP2401) {
> - int i;
> - int err;
> + int i, j, err;
>
> - assert(stream);
> - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() enter,\n");
> - for (i = 0; i < MAX_ACTIVE_STREAMS; i++) {
> - if (my_css_save.stream_seeds[i].stream == stream) {
> - int j;
> -
> - for (j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++) {
> - if ((err = ia_css_pipe_create(&my_css_save.stream_seeds[i].pipe_config[j],
> - &my_css_save.stream_seeds[i].pipes[j])) != 0) {
> - if (j) {
> - int k;
> -
> - for (k = 0; k < j; k++)
> - ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]);
> - }
> - return err;
> - }
> - }
> - err = ia_css_stream_create(&my_css_save.stream_seeds[i].stream_config,
> - my_css_save.stream_seeds[i].num_pipes,
> - my_css_save.stream_seeds[i].pipes,
> - &my_css_save.stream_seeds[i].stream);
> - if (err) {
> - ia_css_stream_destroy(stream);
> - for (j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++)
> - ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]);
> - return err;
> - }
> - break;
> - }
> - }
> - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit,\n");
> - return 0;
> - } else {
> + if (IS_ISP2401) {
> /* TODO remove function - DEPRECATED */
> (void)stream;
> return -ENOTSUPP;
> }
> +
> + assert(stream);
> + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() enter,\n");
> + for (i = 0; i < MAX_ACTIVE_STREAMS; i++) {
> + if (my_css_save.stream_seeds[i].stream != stream)
> + continue;
> +
> + for (j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++) {
> + int k;
> +
> + err = ia_css_pipe_create(&my_css_save.stream_seeds[i].pipe_config[j],
> + &my_css_save.stream_seeds[i].pipes[j]);
> + if (!err)
> + continue;
> +
> + for (k = 0; k < j; k++)
> + ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]);
> + return err;
> + }
> + err = ia_css_stream_create(&my_css_save.stream_seeds[i].stream_config,
> + my_css_save.stream_seeds[i].num_pipes,
> + my_css_save.stream_seeds[i].pipes,
> + &my_css_save.stream_seeds[i].stream);
> + if (err) {
> + ia_css_stream_destroy(stream);
> + for (j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++)
> + ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]);
> + return err;
> + }
You dropped a 'break' here!
Regards,
Hans
> + }
> +
> + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit,\n");
> + return 0;
> }
>
> int
>
next prev parent reply other threads:[~2021-04-23 9:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 15:03 [PATCHv2 5/8] staging: media: atomisp: Refactor ia_css_stream_load() Martiros Shakhzadyan
2021-04-23 9:26 ` Hans Verkuil [this message]
2021-04-23 9:28 ` Hans Verkuil
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=7edb21ff-23b5-8195-877f-829bf17bf6bb@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).