From nobody Sat May 10 06:20:09 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=1619519696; cv=none; d=zohomail.com; s=zohoarc; b=A0zgVn6tfPyEeOY/Pj4nKI1lxVNpe1QpVyE0XpKhZUw3o6GUDDtlnH6dCBvvNxJRV4YXSDWq7F6xRvYeYigfZZApMaPQH5yi9YBgcfDrXy0B9rcyz2+0nt4Us78rh8lMMBTWWFb1vXIn3p8VT2SwToPjctn4psOEn/FaMU/7l+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519696; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4MHdtY8j9PnnXg5fLzOr2wfQzo2yPTPoUTUBaKcVnz0=; b=NLbtuUiEwJKn/r7awpJjqhrlNleCn0qvL0M2DAKRNE/GZ/gfjt4EMTkrM1p6wg9RllWT4EJc1qPZiWWHBbpRv7PGfnyvBTI+Uuvzt466MmLHobVrOk9pZuiJ57gtmdV7GLqjd/dx03dcKrImuP6wVkyQFkoe8hHczQS1N7TOgQY= 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 1619519696331715.0209494919808; Tue, 27 Apr 2021 03:34:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238876AbhD0Ke3 (ORCPT ); Tue, 27 Apr 2021 06:34:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:48288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235478AbhD0K2m (ORCPT ); Tue, 27 Apr 2021 06:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF0996144C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0Q-8p; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=eeb2tTMTeECwFCJsmdUEhrGisH5F5adY0i6Xu5Zdqhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SwSkxNd9WEi1Bzs208u3NSlp7TvU9R2NtZctra1LltP5RKAv8abVn9OPGsTjRwvML JD4wztwvcCU3tIsQG2CWTbT5WYaE8nmsWzG29l+QSEZC3joS5EN8U09T7lzmr+UiqQ aJhJ2xeWT93JOIJ8zgbCbUHMsPUBdpZT/q9m9MIkIHE8boDHuSib3PVyCE3vIlx3kZ 1K7BjOYQTe9Ti8ZVJnDDmXz7v4oZrnEsYg9Ci71nRLcJzVuD2RA63KeQpfVRs+MABN XD80kXDN5VxYWaunuiKWQV1MmeHhDRa9VggbJtUBSoErbd+K0e75+v/85OExHlVcsF QC4yoVchCIyXA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dmitry Osipenko , Greg Kroah-Hartman , Jonathan Hunter , Mauro Carvalho Chehab , Thierry Reding , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v3 25/79] staging: media: vde: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:15 +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/staging/media/tegra-vde/vde.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/= tegra-vde/vde.c index 28845b5bafaf..8936f140a246 100644 --- a/drivers/staging/media/tegra-vde/vde.c +++ b/drivers/staging/media/tegra-vde/vde.c @@ -775,9 +775,9 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde= *vde, if (ret) goto release_dpb_frames; =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) - goto put_runtime_pm; + goto unlock; =20 /* * We rely on the VDE registers reset value, otherwise VDE @@ -843,6 +843,8 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde= *vde, put_runtime_pm: pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); + +unlock: mutex_unlock(&vde->lock); =20 release_dpb_frames: @@ -1069,8 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pd= ev) * power-cycle it in order to put hardware into a predictable lower * power state. */ - pm_runtime_get_sync(dev); - pm_runtime_put(dev); + if (pm_runtime_resume_and_get(dev) >=3D 0) + pm_runtime_put(dev); =20 return 0; =20 @@ -1088,8 +1090,9 @@ static int tegra_vde_remove(struct platform_device *p= dev) { struct tegra_vde *vde =3D platform_get_drvdata(pdev); struct device *dev =3D &pdev->dev; + int ret; =20 - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); =20 @@ -1097,7 +1100,8 @@ static int tegra_vde_remove(struct platform_device *p= dev) * Balance RPM state, the VDE power domain is left ON and hardware * is clock-gated. It's safe to reboot machine now. */ - pm_runtime_put_noidle(dev); + if (ret >=3D 0) + pm_runtime_put_noidle(dev); clk_disable_unprepare(vde->clk); =20 misc_deregister(&vde->miscdev); --=20 2.30.2