lkml.org 
[lkml]   [2022]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] media: imx: remove code for non-existing config IMX_GPT_ICAP
Hi Lukas,

On Tue, Nov 22, 2022 at 02:23:30PM +0100, Lukas Bulwahn wrote:
> There never was a config IMX_GPT_ICAP in the repository. So remove the code
> conditional on this config and simplify the callers that just called empty
> functions.
>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> drivers/staging/media/imx/imx-media-fim.c | 54 -----------------------
> 1 file changed, 54 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx-media-fim.c b/drivers/staging/media/imx/imx-media-fim.c
> index 3a9182933508..19a48eb445fd 100644
> --- a/drivers/staging/media/imx/imx-media-fim.c
> +++ b/drivers/staging/media/imx/imx-media-fim.c
> @@ -187,54 +187,6 @@ static void frame_interval_monitor(struct imx_media_fim *fim,
> send_fim_event(fim, error_avg);
> }
>
> -#ifdef CONFIG_IMX_GPT_ICAP
> -/*
> - * Input Capture method of measuring frame intervals. Not subject
> - * to interrupt latency.
> - */
> -static void fim_input_capture_handler(int channel, void *dev_id,
> - ktime_t timestamp)
> -{
> - struct imx_media_fim *fim = dev_id;
> - unsigned long flags;
> -
> - spin_lock_irqsave(&fim->lock, flags);
> -
> - frame_interval_monitor(fim, timestamp);
> -
> - if (!completion_done(&fim->icap_first_event))
> - complete(&fim->icap_first_event);
> -
> - spin_unlock_irqrestore(&fim->lock, flags);
> -}
> -
> -static int fim_request_input_capture(struct imx_media_fim *fim)
> -{
> - init_completion(&fim->icap_first_event);
> -
> - return mxc_request_input_capture(fim->icap_channel,
> - fim_input_capture_handler,
> - fim->icap_flags, fim);
> -}
> -
> -static void fim_free_input_capture(struct imx_media_fim *fim)
> -{
> - mxc_free_input_capture(fim->icap_channel, fim);
> -}
> -
> -#else /* CONFIG_IMX_GPT_ICAP */
> -
> -static int fim_request_input_capture(struct imx_media_fim *fim)
> -{
> - return 0;
> -}
> -
> -static void fim_free_input_capture(struct imx_media_fim *fim)
> -{
> -}
> -
> -#endif /* CONFIG_IMX_GPT_ICAP */
> -
> /*
> * In case we are monitoring the first frame interval after streamon
> * (when fim->num_skip = 0), we need a valid fim->last_ts before we
> @@ -435,14 +387,8 @@ int imx_media_fim_set_stream(struct imx_media_fim *fim,
> spin_unlock_irqrestore(&fim->lock, flags);
>
> if (icap_enabled(fim)) {
> - ret = fim_request_input_capture(fim);
> - if (ret)
> - goto out;
> fim_acquire_first_ts(fim);
> }

As suggested by the checkpatch.pl:
WARNING: braces {} are not necessary for single statement blocks

> - } else {
> - if (icap_enabled(fim))
> - fim_free_input_capture(fim);
> }
>
> fim->stream_on = on;
> --
> 2.17.1
>

Apart of this, patch looks good to me.
Thanks.

Regards,
Tommaso

--
Tommaso Merciai
Embedded Linux Engineer
tommaso.merciai@amarulasolutions.com
__________________________________

Amarula Solutions SRL
Via Le Canevare 30, 31100 Treviso, Veneto, IT
T. +39 042 243 5310
info@amarulasolutions.com
www.amarulasolutions.com

\
 
 \ /
  Last update: 2022-11-22 17:10    [W:0.048 / U:0.732 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site