From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6DEF1C03 for ; Wed, 23 Nov 2022 08:28:28 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id r9-20020a1c4409000000b003d02dd48c45so521083wma.0 for ; Wed, 23 Nov 2022 00:28:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=4zsa6X0bJBSeI5SJRXVN9RfXeuhhHKtuQ+n10vqBddU=; b=W+ihjKp9cTQKRJ3YDH/877OHZJg9vU8/HHZlsLAPCpvSL0kAKndm70/m02bdhFuzSp X9sQpLD785YHshgIkFrOJtdENKQlN41degI+v/cfxSxpuB4j0OVxqbbfl3yVnGQSjjSb ScZfsPwc12zNbTrrdm0MMZ5zWW+VZkv7DiFhg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4zsa6X0bJBSeI5SJRXVN9RfXeuhhHKtuQ+n10vqBddU=; b=e3VLTy2mxlZZ/X83cbddZ7TDS83RFAPs3NfEd2iKCCkcydVF3H5KILaLQhLy5ebxoi eZN8OiS0r3AHe4Ny8Ekgm/lYxgXnB2i/XrvCnnWhvNf0PV9ZFE3yC3W9NamFHATRsngf Pt6FHysHH4aR3yBprjCTsqm01YZME+I7kmnHup+GPfiKdCb5Tj5w1HR/RnN/9NkrKgfU NB1aSeKtFfOlI4Qrjx3/UQfzEXMkqdCEV58vln6BG0K5K1o83v4yKbrIGh32JNi21ySv Rj9LvpFKmTQILbNzGAtlGPVtBFAfUe7IJn01r2UsUR7dM/w17zun0IhSR68av/e4oRde PZYQ== X-Gm-Message-State: ANoB5pmn//utX3NCMjOTLGrNlL9g+lbD0MtBW9oEZ5eIny4/V3QkCXyH /VFd+hZnd4pix+qPLVrGxqLLHw== X-Google-Smtp-Source: AA0mqf4h6G/PTAeQFiW5ZlfDJ8DIM/Eqep75hP7lJmpHXeFc8ORiMP49ipOMR+ht6BQHBWycaH5qhQ== X-Received: by 2002:a05:600c:538b:b0:3b4:7e87:895f with SMTP id hg11-20020a05600c538b00b003b47e87895fmr19332071wmb.30.1669192107146; Wed, 23 Nov 2022 00:28:27 -0800 (PST) Received: from tom-ThinkPad-T14s-Gen-2i (net-188-217-55-94.cust.vodafonedsl.it. [188.217.55.94]) by smtp.gmail.com with ESMTPSA id i1-20020a05600c354100b003b50428cf66sm1448192wmq.33.2022.11.23.00.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 00:28:26 -0800 (PST) Date: Wed, 23 Nov 2022 09:28:24 +0100 From: Tommaso Merciai To: Lukas Bulwahn Cc: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] media: imx: remove code for non-existing config IMX_GPT_ICAP Message-ID: <20221123082824.GD39395@tom-ThinkPad-T14s-Gen-2i> References: <20221123075216.28193-1-lukas.bulwahn@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221123075216.28193-1-lukas.bulwahn@gmail.com> Hi Lukas, On Wed, Nov 23, 2022 at 08:52:16AM +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 > --- > v1: https://lore.kernel.org/all/20221122132330.30408-1-lukas.bulwahn@gmail.com/ > > v1 -> v2: > - addressed Tommaso's feedback: remove braces for single statement blocks > > drivers/staging/media/imx/imx-media-fim.c | 57 +---------------------- > 1 file changed, 1 insertion(+), 56 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-fim.c b/drivers/staging/media/imx/imx-media-fim.c > index 3a9182933508..fb6590dcfc36 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 > @@ -434,15 +386,8 @@ int imx_media_fim_set_stream(struct imx_media_fim *fim, > update_fim_nominal(fim, fi); > 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); > - } > - } else { > if (icap_enabled(fim)) > - fim_free_input_capture(fim); > + fim_acquire_first_ts(fim); > } > > fim->stream_on = on; > -- > 2.17.1 > Looks good to me. Reviewed-by: Tommaso Merciai 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