From patchwork Thu May 6 15:25:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12242473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20F0DC433B4 for ; Thu, 6 May 2021 15:29:44 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C5C1D61C22 for ; Thu, 6 May 2021 15:29:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C5C1D61C22 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=k4ncuRLh+kMXFY+tI1Opkrni7XJobtbJI/MNTJezb64=; b=ICLzBPfaEIwbcWeZoR+milI6D JFgehuShQq6+jEb8RMrDOlgeCtKJfszzPifHYTT9jH9tpiJ8tdafINuZh3O15zIFx28WN3WhjBH0z rzHu5eJjXXmcF42npHEySe8Gr74+wgc640/NpYTLkAkuhTBnhHUhRLDCwvJeBHBUf45M1plmp1qgu HXUcYZ1e7om+nti2JGMIzEv3h1PhFdBZH57BHzzUWCO3VIFYFKzR8xPfSOYHx18jjgNGYI7y9+6aZ Hn7IKEDqWhl0PO7+qQvS9iiAPNSg4UNUDX6qtbZ7uvD1wzLThi16yFmehx3zz+OZvxBKwXTigN7eu jHzDvDBmw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lefv6-004YKQ-Cc; Thu, 06 May 2021 15:28:09 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leftk-004Xsp-U2 for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 15:26:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=mRlhHz+TXhBYOhgqqW4JThrnHdpvqrv4T1yGT3S16Vc=; b=XMuE4kr7ybWkGqeYAI7hF3lFX+ MJ+QclKMbb0Wqk5Q12s6lLBo/hZcKJeTo9FMNYcDGw/kfZHULSRSasuA5zKWF4s6PEwqnSvBwwSQp n0XlJfTA2KHDfAd52pVGiGVOlrUrJ04s7/q7l1F8EcX2teatT6QERJyrEeLC5L0Yw26TZKCj5KG0N 5ZyJ83hTiOSe6iYprElCUkyYaRx9cakEVW8128xLzZm76mjwPQ+gUqRIzWlH8SpmpeOvswhxtLN7x k2FPtC1ZPQgnvLylPwW0FF55Lcndwc+kou/FxOJxNERJKmGuPugi1ihw70NeO8aRlmijaAq0QEfQE jyeRIt8Q==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leftg-0068x1-Bw for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 15:26:43 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E692D610E9; Thu, 6 May 2021 15:26:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314800; bh=WwdunTEPlspSuJNcgiz5VlTq6QqTmYyotSIBFOxVREY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pN0tPqqYk+vmmU/IHozBA1LbWIRQut8CTp+kYjegk8iR7zcI3WVRhDloKTUMufuDy QqAYFWcgR0ME4bszD+ELg0qNEsOod58GZfuLaKbREBx8WMGfHz22eVGYe7YI/IwfC5 4RFWfKGZts1S81nHfCl5/MWdAWGB87VcFLwHpb34ynAhwqJagJd51CF7hNg2BMIpVH zubDv5uHE1nKFt9vVCA6BkIZxzQibblFPeTPfbzDPOUbnF/R7b0R0svlfWsRKt+gEs GJMe3bjcniBd4pNe/qddyiZ3wHct8whmmDsrCfSji0PLkXcwjQI1ql9iuBCb91sSeE hBWVZZEN6++1Q== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left7-000SB5-M0; Thu, 06 May 2021 17:26:05 +0200 From: Mauro Carvalho Chehab To: Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Fabio Estevam , Greg Kroah-Hartman , Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Rui Miguel Silva , Sascha Hauer , Shawn Guo , Steve Longerbeam , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v5 01/25] staging: media: imx7-mipi-csis: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:39 +0200 Message-Id: <74ab04a6bb8949d9b12b203def1e0c57b7793db5.1620314616.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210506_082640_599074_E3A5AD44 X-CRM114-Status: GOOD ( 10.75 ) 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 Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Acked-by: Rui Miguel Silva Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/imx/imx7-mipi-csis.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c index 025fdc488bd6..1dc680d94a46 100644 --- a/drivers/staging/media/imx/imx7-mipi-csis.c +++ b/drivers/staging/media/imx/imx7-mipi-csis.c @@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable) mipi_csis_clear_counters(state); - ret = pm_runtime_get_sync(&state->pdev->dev); - if (ret < 0) { - pm_runtime_put_noidle(&state->pdev->dev); + ret = pm_runtime_resume_and_get(&state->pdev->dev); + if (ret < 0) return ret; - } + ret = v4l2_subdev_call(state->src_sd, core, s_power, 1); if (ret < 0 && ret != -ENOIOCTLCMD) goto done;