From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83C63C4332F for ; Wed, 23 Nov 2022 08:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VEM6VUJ7Oy0rBY1TBNrc1HwkooElpvZMH46StZJvwIU=; b=SxRdopjlMuUvCl 7tFzE4xD85mxSWYY6J3AwbLJeiGVqLk7vkzAJ9Ov+WMYwV1ChGb9bV/zEwLj2iiR9ilugVm1z4Dph no65zHvl60fqiCVaJuZ4e7Nnxzrm2qK6g3GF+XrcV6E7/wzNspZA6FrJ49vy//QJYiwhGbvW6l2QK k5wEfQyJMM4IrCpMRU/Vos/Zqn0fvA7C17PpPtvdgUs7y3GWkCh7VuSXeDdCSp5zkI8S0H0eUnc5P Ouxe5ht153ZWG94+8e3NN0FxmTTYsgi9lijO+bIXVp9K/Ocl+zsKmQr8JhCBms072LGkY/usUbe56 OH3yuuRXI6KOw+Z5Yhrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxl7T-00FWyZ-OT; Wed, 23 Nov 2022 08:28:36 +0000 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxl7P-00FWs9-Ll for linux-arm-kernel@lists.infradead.org; Wed, 23 Nov 2022 08:28:33 +0000 Received: by mail-wm1-x336.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso763450wmo.1 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=JePMukc75C7W32Va89td4dXCX4tNNQ7R3ozUakpXPlyIK0sonHZXztZS7TZ9X78BDG 2yp4dcuYZlMaC+d9luczD+a/ksBCW4Y1PR0uXYfjy4iZOI6nnTRn58NSGtVEb7Updg18 0VgBMBbBUKtr+i4uyJYaI4BHRkibOIdExxebUTNVdSr9aeURC+ft8kyTmvkhizD4ncBr k36mQEt0k8+DB8dHMqHHrvFZ0VmVEkbXM7jFwuCXsVWeBoZJmUM+ZvGcOvoj7qpWPfQM p10vKVg50R7+97myN1duvmdHSLQZ+r8H/tCfV2SGdBSRj4nXqhfyI6kYK+R1HLZrGAbM nmyg== X-Gm-Message-State: ANoB5pnvIEgBxLqwdyDa1lC1ES56kCleaXjl2Uf7cVaHUpIGfM7FeAF5 1IOb52dH/pvk7Y6N1urQ4070zw== 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> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221123075216.28193-1-lukas.bulwahn@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221123_002831_753927_B6E125C9 X-CRM114-Status: GOOD ( 23.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel