From patchwork Wed Nov 23 07:52:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 13053222 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 7C6ECC433FE for ; Wed, 23 Nov 2022 07:54:02 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=HQIBnSbXoeHdxtzb/+vhwYxDnY1LH5ny/IbjsIAC0IE=; b=q0PkVX44O7C754 JbwonoEgu9EKLk/Cg2tearoL7hM3GzzCvMp0W4I7eSgR+rW6BQbaUrLZbOL6uIUMOzXnI64Onvks/ 1LidYe0u/3OTaKOMRuaQEIliunYUp9uv4l/HDKQIGfktS7Grggbr9ZYTg8tAhv5y3KWWQdLOp0eRZ y4kbQEfOoej0pVC7Ohh37WkpZ/GdA/zHgWIJMCgHiHlsVRgQcKYNsxYfEK4ynjhb/VbpZD2OoOykr 92x9FJbPX4ZKWQzdnezGBxbrscVtMM5pJ+wFe2QRy/9rTj1/94R02Fp8Ooz1YX9kPc+knGOexuy/+ LkqejM2VpJCaKx0pqD/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxkZ5-00FLRD-5e; Wed, 23 Nov 2022 07:53:03 +0000 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxkZ0-00FLOL-O0 for linux-arm-kernel@lists.infradead.org; Wed, 23 Nov 2022 07:53:00 +0000 Received: by mail-ed1-x534.google.com with SMTP id z20so22253000edc.13 for ; Tue, 22 Nov 2022 23:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O0yfirNFzSWzAhcJFMcFEJmgVxDm9YhSShEjcea986w=; b=mVj/FwhVcYMzmmP6AxFi7yqc+VHmkYbSfU6P2CcX2UFk13En38/5mWgcINrhK99rF0 AqyVrj3uUWsdJ4Uk2CZjdSWHoyv0IvJidNtBFdKNHIla8e0WGA3rxv8iq3cuUuOMEu+q /+yeU10agp17Su3tYED3qb4kvtY/1fs9s4BZDXc1Zc5EdkBaH3mzScuut8bO+5bW4FkJ yavleHZfZCG0rqUFCOJzmFJj99LXdrlaLgGX/erQHjs3uHJBO89l88m64D7ekF/6T+XQ w1dc5kNBvuEGG25my1Wz7AbUoyBOQIizysbrnKk74jbAWkPQhAiolNjeIVz0OcSWRioJ EWKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O0yfirNFzSWzAhcJFMcFEJmgVxDm9YhSShEjcea986w=; b=RaVWigacxs2FzOJcGhPRytz8ikDIZOzBLO4IVj168YU+RIraOt9QKr8RpcoXk3+nr3 GWX1rP5mg9mgDciZsQP/T8WV2xqQVb76O8EqH78qB1H4SV2sGYY1VvMLDr4Vc8jxzyrz DnfoLtwUDyIYCiyJCcT+uvUzWV/CUWAZa3DyugyeKJ4zb0uSytWcWSdD7JjgDvcTJ7iX ygE/yi1WSf9bgwPP/Huao9WnwwC9R795uZLk1HHBCcDdaVNxvXlT6VfVX4FTNed2h9GQ 2jYL+3NZwBBkT/3FqpkBn1cmfiWXfOAwpqIH2f7I3kYa6Rsla1nek+6dMXlkq2+0kYHG jPBQ== X-Gm-Message-State: ANoB5pkQj2DjO55CE59JmuOCYRAVMXSBtv0QlPMFx3g3SXpG2OEs0eZZ 1bkt8/3PJzJdHTPA5aClXpk= X-Google-Smtp-Source: AA0mqf5Xvi3z9Sp5yVfGgZrxfUb2PGtJP+JBHOpfXSH2C8Ujhc7Qtn9CkEBRCV0uOdixgrRjfeTo6A== X-Received: by 2002:a05:6402:12d5:b0:469:885b:fcfd with SMTP id k21-20020a05640212d500b00469885bfcfdmr9646583edx.177.1669189976429; Tue, 22 Nov 2022 23:52:56 -0800 (PST) Received: from felia.fritz.box (200116b826997500d517ac74edd630a9.dip.versatel-1u1.de. [2001:16b8:2699:7500:d517:ac74:edd6:30a9]) by smtp.gmail.com with ESMTPSA id w14-20020a056402070e00b004691de0e25bsm6112889edx.54.2022.11.22.23.52.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 23:52:55 -0800 (PST) From: Lukas Bulwahn To: Tommaso Merciai , 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 Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH v2] media: imx: remove code for non-existing config IMX_GPT_ICAP Date: Wed, 23 Nov 2022 08:52:16 +0100 Message-Id: <20221123075216.28193-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221122_235258_808789_83DEC61B X-CRM114-Status: GOOD ( 14.71 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Tommaso Merciai Reviewed-by: Philipp Zabel --- 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;