From nobody Sat May 10 02:29:11 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619247066; cv=none; d=zohomail.com; s=zohoarc; b=AvllCeg6+XNv0zatv3bxj/CsPdmf4KSXwQA88IRFWr4yiki0ritBiryr7ivKna4n/+4h26RkfTBkh1XE1Ryy6GRbJcapD0Lm1qBz+m9JbmJkLcpJP02PWWTYRz6+frBMrhQL/eBwuTmhzhRHAiQF9GnPTM3TrbJOMtpYEmDPFEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619247066; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vjKZYayq40+t1Ct9amnVHUxGdh0RSk8TDWmOKQ5PDYs=; b=D7cw3C9CtfdV6V42T9tuMqDXGO9vh4fbS6UuqQyAZKi7457LfxOZck67H4+bgnuN/N+4xIjgJskbaLh8Tj/Q8cd1g7Z/tj4YiswXhBuh6KjXDfTexIwYrT312kZX8vdJV1RWObqd/+4+DO/RuFfPj2At8LDJP5lWwFk4GlWdUY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619247066735214.04480121172128; Fri, 23 Apr 2021 23:51:06 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244331AbhDXGvn (ORCPT ); Sat, 24 Apr 2021 02:51:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:36126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234041AbhDXGqW (ORCPT ); Sat, 24 Apr 2021 02:46:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B521261932; Sat, 24 Apr 2021 06:45:33 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1laC2m-004Jh3-T5; Sat, 24 Apr 2021 08:45:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619246733; bh=SAhPriNR9qiCUHOpk5nwypqhByAWvaCmyWtxT8wI2LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AH/aohbJTXkk53XxBSfIIzU/NIkaOH9jjmX2c+i2KMEyJV1KV3/i8PFVJyxAPtGUL 4Xkyh6U4UyE1ujNE8dVGSkmaSazpLqT37HZoXkQAfB2IaOjDasfMm0CZp1dgsGnOWJ 5yhiGl0Bv4z72NyVRNZbTSPpZmgHjpezLTzHJRyNXPUVYEzLyfvA2Plnbgo1DdCKkR Qy+zlkWuGCjJBZBn1vTW6tqFg4sTVfB1dXVH6JpiYYMf6dPCfQP4GPS0TX7XEoVIeT rBXM9LlPw3C91oiKsRuozxBMkFkhAmsVHJeRB0YYGn5RP2YGQhNSmSgH6iOa1PLqLp oHZHxmwfBvzhw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH 69/78] media: rcar-vin: use pm_runtime_resume_and_get() Date: Sat, 24 Apr 2021 08:45:19 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th 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. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/rcar-vin/rcar-csi2.c | 2 +- drivers/media/platform/rcar-vin/rcar-dma.c | 6 ++---- drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/pl= atform/rcar-vin/rcar-csi2.c index e06cd512aba2..85574765a11a 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -408,7 +408,7 @@ static void rcsi2_enter_standby(struct rcar_csi2 *priv) =20 static void rcsi2_exit_standby(struct rcar_csi2 *priv) { - pm_runtime_get_sync(priv->dev); + pm_runtime_resume_and_get(priv->dev); reset_control_deassert(priv->rstc); } =20 diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/pla= tform/rcar-vin/rcar-dma.c index f30dafbdf61c..f5f722ab1d4e 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -1458,11 +1458,9 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u= 8 chsel) u32 vnmc; int ret; =20 - ret =3D pm_runtime_get_sync(vin->dev); - if (ret < 0) { - pm_runtime_put_noidle(vin->dev); + ret =3D pm_runtime_resume_and_get(vin->dev); + if (ret < 0) return ret; - } =20 /* Make register writes take effect immediately. */ vnmc =3D rvin_read(vin, VNMC_REG); diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/pl= atform/rcar-vin/rcar-v4l2.c index 457a65bf6b66..b1e9f86caa5c 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -870,11 +870,9 @@ static int rvin_open(struct file *file) struct rvin_dev *vin =3D video_drvdata(file); int ret; =20 - ret =3D pm_runtime_get_sync(vin->dev); - if (ret < 0) { - pm_runtime_put_noidle(vin->dev); + ret =3D pm_runtime_resume_and_get(vin->dev); + if (ret < 0) return ret; - } =20 ret =3D mutex_lock_interruptible(&vin->lock); if (ret) --=20 2.30.2