From nobody Sat May 10 06:21:12 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=1619621957; cv=none; d=zohomail.com; s=zohoarc; b=MES4tFMRSCTU7wUqjI6H/S6G5WU34KNcTOd9B2tK1B6dId3maUQsjyvA/p4WurnZY+FrQ3tpC6ezI7Q6OZsV0zit4sMuKMotEoDhHYiAirx+kn+QnTFBiTm2ewi9OirYPq6sw7KkduTVCNAXcvVLBKiT2A6vkZgo4v/nlOYD1kE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619621957; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YtQ0P1vd+y8srWxmBNsx/NSrqEwKQuCn+Cs9Cghe4oI=; b=UM+K65OSJR/rxByxauTzKTbpOI7MhOlWakVMDyYQWQ5v6zyUbgVmIlw7iEBrCrZF7g9O8g/PPnbKmbCV2EfkMPmvb/8+guFHippwZ5cM2FR2tb2MdLbF6c4reeNP8QOCts3eNFcX6B4YtNDvw9v93lkG+O8+W5ngFYXAtJrwatM= 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 1619621957522966.6121471071783; Wed, 28 Apr 2021 07:59:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239956AbhD1O77 (ORCPT ); Wed, 28 Apr 2021 10:59:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:36784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240350AbhD1Oxm (ORCPT ); Wed, 28 Apr 2021 10:53:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 751FC61883; Wed, 28 Apr 2021 14:52:44 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lblYR-001Dsm-G8; Wed, 28 Apr 2021 16:52:43 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619621564; bh=8E/41fS9i4G6Idc8E3ODBm45B0Q7is3E1XHHj0lw4IM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b8OxqQi8Gg8ywRDCZQ5PazgM0+mAHb/Rk1NXUFai6+AYyGQieVVSGyLmmTsMjh1ML 4+DurHLxwdvdDj6ohGKaZAd5Bi/zjJ5jD172KNQoCY3Mx1muo+2uZQGeIoAQCDTHu4 8KaJGpNPBnCoUeOHwkG6RXdowy58xIwq/nQpIthEKKXB6PxZxgImPVMAWRSKQ3zwVF uQgEdNhJxw9dU0Bp0ZJyVAzfj5fR3RMFJlXRntoPIjqxEZ0r1SOT+9BfMpyjC63ZR8 7dwR7Q7JJHJ4nKDaGvfvrjfjLHue3yjigk62gF1o7YuAZX5MzfF6VkQsepHxlwCNOI g6UBYWksn1u+Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v4 66/79] media: venus: use pm_runtime_resume_and_get() Date: Wed, 28 Apr 2021 16:52:27 +0200 Message-Id: <1daefd9339fd957a0199e0fe18033014945239a1.1619621413.git.mchehab+huawei@kernel.org> 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/qcom/venus/core.c | 30 +++++++++---------- .../media/platform/qcom/venus/pm_helpers.c | 10 +++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index c80c27c87ccc..aa359f8e82c5 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -84,11 +84,9 @@ static void venus_sys_error_handler(struct work_struct *= work) container_of(work, struct venus_core, work.work); int ret =3D 0; =20 - ret =3D pm_runtime_get_sync(core->dev); - if (WARN_ON(ret < 0)) { - pm_runtime_put_noidle(core->dev); + ret =3D pm_runtime_resume_and_get(core->dev); + if (WARN_ON(ret < 0)) return; - } =20 hfi_core_deinit(core, true); =20 @@ -110,11 +108,9 @@ static void venus_sys_error_handler(struct work_struct= *work) =20 hfi_reinit(core); =20 - ret =3D pm_runtime_get_sync(core->dev); - if (WARN_ON(ret < 0)) { - pm_runtime_put_noidle(core->dev); + ret =3D pm_runtime_resume_and_get(core->dev); + if (WARN_ON(ret < 0)) return; - } =20 ret =3D venus_boot(core); ret |=3D hfi_core_resume(core, true); @@ -313,21 +309,21 @@ static int venus_probe(struct platform_device *pdev) =20 pm_runtime_enable(dev); =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) goto err_runtime_disable; =20 ret =3D of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D venus_firmware_init(core); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D venus_boot(core); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D hfi_core_resume(core, true); if (ret) @@ -359,8 +355,9 @@ static int venus_probe(struct platform_device *pdev) v4l2_device_unregister(&core->v4l2_dev); err_venus_shutdown: venus_shutdown(core); -err_runtime_disable: +err_pm: pm_runtime_put_noidle(dev); +err_runtime_disable: pm_runtime_set_suspended(dev); pm_runtime_disable(dev); hfi_destroy(core); @@ -379,7 +376,7 @@ static int venus_remove(struct platform_device *pdev) struct device *dev =3D core->dev; int ret; =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); WARN_ON(ret < 0); =20 ret =3D hfi_core_deinit(core, true); @@ -390,7 +387,8 @@ static int venus_remove(struct platform_device *pdev) =20 venus_firmware_deinit(core); =20 - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); pm_runtime_disable(dev); =20 if (pm_ops->core_put) @@ -411,7 +409,7 @@ static void venus_core_shutdown(struct platform_device = *pdev) { struct venus_core *core =3D platform_get_drvdata(pdev); =20 - pm_runtime_get_sync(core->dev); + pm_runtime_resume_and_get(core->dev); venus_shutdown(core); venus_firmware_deinit(core); pm_runtime_put_sync(core->dev); diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media= /platform/qcom/venus/pm_helpers.c index c7e1ebec47ee..9e32ec866af7 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -486,7 +486,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) int ret; =20 if (coreid_mask & VIDC_CORE_ID_1) { - ret =3D pm_runtime_get_sync(core->pmdomains[1]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[1]); if (ret < 0) return ret; =20 @@ -504,7 +504,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) } =20 if (coreid_mask & VIDC_CORE_ID_2) { - ret =3D pm_runtime_get_sync(core->pmdomains[2]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[2]); if (ret < 0) return ret; =20 @@ -990,11 +990,9 @@ static int core_power_v4(struct venus_core *core, int = on) =20 if (on =3D=3D POWER_ON) { if (pmctrl) { - ret =3D pm_runtime_get_sync(pmctrl); - if (ret < 0) { - pm_runtime_put_noidle(pmctrl); + ret =3D pm_runtime_resume_and_get(pmctrl); + if (ret < 0) return ret; - } } =20 ret =3D core_resets_reset(core); --=20 2.30.2