From patchwork Sun Sep 29 13:43:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13815121 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 8D50ACF6499 for ; Sun, 29 Sep 2024 13:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NB2Fen65XiQw/ftAHOXXAbdH1RHS0sveFsUyfGQ/rtw=; b=Xq+6E4vrjEHfWx2hwTvyFT/sxV ILveZ27uJEzNAdT3ibBewJn+wpnj2neYF+7a5tnU3DdTKeyhX57HUOU3S8dK9A3sFGLL04OcS5Ba2 VMD+YZu3ynopiCXR6LWRrmw0YH25905lO1cPLEGi6ZcQFDV25ucuIV4etkhbiQG3Ui0okigvrpzb0 T1O5oawlMlicf39iE39mh5aUNZP3iko6OBiCT+xN2GNxzn3uFBWI0LHvzhzQShC/t1VfT11cVm+Mi p5Q6l7ib9f5F4mpWYoS4CBaYkBMv+IEZR/knkRQ+oi/+ZoM+yvrurIATBPcLyAV/aMxr8pD+hM3q4 z+UgRbIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1suuGv-0000000EqQG-0d7c; Sun, 29 Sep 2024 13:47:37 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1suuDR-0000000Epiw-00LI for linux-arm-kernel@lists.infradead.org; Sun, 29 Sep 2024 13:44:02 +0000 Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 805556DE; Sun, 29 Sep 2024 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1727617349; bh=oMfSYlB7P9eLwoLyD1PZzgkE2aC3vO/4RvgIGutTDEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUbrEfjU5GOgNz54YsMVhBoPA5Ag4Lc8j4f07vmRdQ20/4uokamIH8Kz085KY02Xv vN3zHeUBLZKOcbnH2T5A9QBBwCASp7Nlmxi9woCiJbnqEjFqdkcdJ3AuBMd/CoEuLa EKgX4jdPMf11BeQWLU/QFZM3h/Muw6dDq+t/1KFE= From: Laurent Pinchart To: rmfrfs@gmail.com, martink@posteo.de, kernel@puri.sm, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com Cc: guoniu.zhou@oss.nxp.com, imx@lists.linux.dev, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: imx8mq-mipi-csi2: Drop ST_SUSPENDED guard Date: Sun, 29 Sep 2024 16:43:53 +0300 Message-ID: <20240929134354.20735-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240929134354.20735-1-laurent.pinchart@ideasonboard.com> References: <20240929134354.20735-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240929_064401_189128_0C2D5ED9 X-CRM114-Status: GOOD ( 11.96 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ST_SUSPENDED flag is set at system suspend and cleared at either system resume or runtime resume. It is then used in two locations: - In .s_stream(), when starting the stream to return -EBUSY if the device is suspended. This can't happen, As the function calls pm_runtime_resume_and_get() just before the check, which clears the ST_SUSPENDED flag. - In imx8mq_mipi_csi_resume() to skip resuming if the device isn't suspended. As imx8mq_mipi_csi_resume() is the system resume handler, the device is by definition suspended. The ST_SUSPENDED flag is therefore not needed. Drop it. Signed-off-by: Laurent Pinchart --- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c index 8eb9c7049425..0f56a40abf33 100644 --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c @@ -64,7 +64,6 @@ enum { ST_POWERED = 1, - ST_SUSPENDED = 4, }; enum imx8mq_mipi_csi_clk { @@ -404,11 +403,6 @@ static int imx8mq_mipi_csi_s_stream(struct v4l2_subdev *sd, int enable) mutex_lock(&state->lock); if (enable) { - if (state->state & ST_SUSPENDED) { - ret = -EBUSY; - goto unlock; - } - sd_state = v4l2_subdev_lock_and_get_active_state(sd); ret = imx8mq_mipi_csi_start_stream(state, sd_state); v4l2_subdev_unlock_state(sd_state); @@ -673,8 +667,6 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) ret = imx8mq_mipi_csi_clk_enable(state); } - state->state &= ~ST_SUSPENDED; - mutex_unlock(&state->lock); return ret ? -EAGAIN : 0; @@ -682,24 +674,13 @@ static int imx8mq_mipi_csi_pm_resume(struct device *dev) static int imx8mq_mipi_csi_suspend(struct device *dev) { - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - imx8mq_mipi_csi_pm_suspend(dev); - state->state |= ST_SUSPENDED; - return 0; } static int imx8mq_mipi_csi_resume(struct device *dev) { - struct v4l2_subdev *sd = dev_get_drvdata(dev); - struct csi_state *state = mipi_sd_to_csi2_state(sd); - - if (!(state->state & ST_SUSPENDED)) - return 0; - return imx8mq_mipi_csi_pm_resume(dev); }