From patchwork Wed Nov 22 13:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 168364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1312822vqb; Wed, 22 Nov 2023 05:14:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5twM8253tVSNU/SpLW24Qy/B+EtoZ32BEko+FTpRNNkm9pbXLvv4wN3LVF4eNQ45tCj+u X-Received: by 2002:a05:6a20:c990:b0:187:36c0:aa6a with SMTP id gy16-20020a056a20c99000b0018736c0aa6amr2320918pzb.27.1700658863347; Wed, 22 Nov 2023 05:14:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700658863; cv=none; d=google.com; s=arc-20160816; b=P34v3yDiKBchRmsueeIwlIvNIU8dOcaeUOB4tcUT/CruzZsWVB+T2wYhpIOwPqMaTr vKlXhLll+XUX/HXp81mgxmxUQqt8LufuK2dd/SowzONiLYEiTccXhenhjmvFf3qnJbRb y9Qfq94F5kFGeaFrofS+oPSS1WTD26ZLBuMpGFgMlGjY2zMOA0km0+P/zywH5xwzWwzg lcGe2GhlQbtfCB0vCllykCE28Wwrtpusy1wujjuK+ylZsL5mneAYYhanJ+DUtEg/qjaJ 0/jZ4jPS5YRHkeJ4Ib63/3o0BcH0PhkySa/gmm1IXSIdIOaXXK5AiDjQXe63Zy9q8f+D yf7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=H/8KiRT5TE4sPArzOBx8MOAsnu/B2RbFQat+8w+l8FU=; fh=7dkMOs5/tPCl/heSmN/G4SnIn36MQ9Q1x2sCPQaV5HQ=; b=SjnMn8C/6ma4FvcjFwOQ9k+5usu48ZUCSXWnc44IMOydKPno5+Ji5uOjvb6Gz9uARM 3h0rsV6AGwUT9CUsbpS+G+M8S440E+DE4to3a7mKKXTiNYUkgv2gIH7bRdBe1+naA9YP FOtPzKwJsFr1eHzgHfacs4OVowr7Bj1QChJ5ypKw6n8assHlMb6NPzwPsYNBFYbquzl3 fAdnsyy3T2FvmAUUvRBwLSS57Up1FvclUOx+K7RCaQttKfgvqn3HyXw+3obgjLV9x7/6 1pYJ7juSNNhxeYu07KSJITmPH0hPMB3d74/6dE7OWxJaAyIoyyxLTOislh4U/mb/+p9c Xh+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=q9SkXhu4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d7-20020a056a0010c700b006b905fe37b7si12941632pfu.221.2023.11.22.05.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 05:14:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=q9SkXhu4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 35C5E81D80A1; Wed, 22 Nov 2023 05:14:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343896AbjKVNOV (ORCPT + 99 others); Wed, 22 Nov 2023 08:14:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234611AbjKVNOS (ORCPT ); Wed, 22 Nov 2023 08:14:18 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EAF8193; Wed, 22 Nov 2023 05:14:15 -0800 (PST) Received: from [127.0.1.1] (91-158-149-209.elisa-laajakaista.fi [91.158.149.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 18BDF29A; Wed, 22 Nov 2023 14:13:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1700658821; bh=T8/2/eVWOaSK74Zk/huyWx16HxOvhau72w6ke9khnUk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=q9SkXhu4AQI4R7ZMreUYZcuHkeiW7TLR2XuUdvegGAgerF8PVMtLjXJtq6eval9aC JD/KOU8ZnYDr04uxr0kIZo4+gO4qlE0UDhqAq6vkzN+76f/0KXjXQuSwhmfp1EKhzu ZsQSiRHaj7FGYrtYcfhg9jFcCKD5aKciIKJdsLLY= From: Tomi Valkeinen Date: Wed, 22 Nov 2023 15:13:48 +0200 Subject: [PATCH 1/2] media: imx-mipi-csis: Fix clock handling in remove() MIME-Version: 1.0 Message-Id: <20231122-imx-csis-v1-1-0617368eb996@ideasonboard.com> References: <20231122-imx-csis-v1-0-0617368eb996@ideasonboard.com> In-Reply-To: <20231122-imx-csis-v1-0-0617368eb996@ideasonboard.com> To: Kieran Bingham , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger , Purism Kernel Team , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Cc: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1197; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=T8/2/eVWOaSK74Zk/huyWx16HxOvhau72w6ke9khnUk=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBlXf6hZE9bpUJV4Xp6/7RrJtsJvOTki0kH73Zcr 0+T/K2GQRyJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZV3+oQAKCRD6PaqMvJYe 9YCED/oCFm3ABpBs9PrRCrZNYgdhLzwVyaBddL4bnnEd2fj7Vebw/mDfOLyots2G/qgh3WUNpMO JZhPrZ+Xi4aoVX7kC1i0TM5nZu9POri2ZeExU4FvkSmumv5W9bX7PRAduTVaVEBlYP7Lo+9RGqq vuOXFereBiNFf6eORCGVVkqOl0QH8jp//mpAToioKRNnPKR2XoJ+/uFY3FJxdhGnGPv//bwiSK/ eAzx29cSVH5F8wzNwZyTsfpMawgXe34+olYfRGKDgimDqhxrTUgzL/+iKEy3++jH+LxRnYUBAtR EpYBh2ZHXAxLj0HKY/qHKf+hP2WLQgd/ixo56OZOhE7J12lJI9lZdGZQ/wECil0sHzywmXE2TVN ylQZoqv7AnaA5+v9YzuTFyG/UKGibHafEtR6+gmYgG6y3yWdslKRuMtPo9nSsUgOLIQX1qUPhVh 2pKA4F7IhpgxruyQxR7nCSBl3M1nLHgYpZKL7DRzSP4dHZk1szlGszk8e+k0EN/Ob7vINkiw28E ayWAgQ15wKhtqA/xgzSy6nWF6/grR/Xft73DHDxnxS6ikIeptO0Z+nz0L/iQob6BqsxGe+TEfZ8 8jI9JDALlV+H5lt87UkVKvemv2BaNhptriVCQpNs+BPuRpxrRO9ej6ab58qBqC8cmpNqQoOdH8W WyCa57C2XU1DUKA== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 05:14:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783270068254445717 X-GMAIL-MSGID: 1783270068254445717 The driver always calls mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in remove(). This causes multiple WARNs from the kernel, as the clocks get disabled too many times. Fix the remove() to call mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in a way that reverses what is done in probe(). Signed-off-by: Tomi Valkeinen Reviewed-by: Laurent Pinchart --- drivers/media/platform/nxp/imx-mipi-csis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index 6cb20b45e0a1..b39d7aeba750 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1502,8 +1502,10 @@ static void mipi_csis_remove(struct platform_device *pdev) v4l2_async_nf_cleanup(&csis->notifier); v4l2_async_unregister_subdev(&csis->sd); + if (!pm_runtime_enabled(&pdev->dev)) + mipi_csis_runtime_suspend(&pdev->dev); + pm_runtime_disable(&pdev->dev); - mipi_csis_runtime_suspend(&pdev->dev); mipi_csis_clk_disable(csis); v4l2_subdev_cleanup(&csis->sd); media_entity_cleanup(&csis->sd.entity);