From nobody Sat May 10 06:34:35 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=1619519559; cv=none; d=zohomail.com; s=zohoarc; b=IWxxSr9fm09kS5XpG9qCAcipwZEUNXEYrpj+uOrCaUsPuR1HBLM255L2QV/qFWCMtmJpJ6cbT/z/S0DkpEOJfp3PdxEO0CkE+vpXpI/me2GvzZlx0QXlGlV1p9rCwjxes8eLu5N8qoWKWdC/QA4YFNs6HEmDJe2llU1rMe50BGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519559; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uIuBJmF0HMMlsWHg0vzZdGoLC6Q8BIvrlc0MUDc9Jqg=; b=ZqmuHRakISJLnuUP+jGrJwCplmDv6VaVNGsHn7gMlYmcIn089shasvFLCnl9yIRM4haBfYG9b2+RitaUQ3tp3B2eMam5ulFw1DBmQu3rhSByurv1FHfz+PaPuCE9r/RLTkAyMKMFT0CEs1ASfvuSMQB5Jeohgq6P1ivgOT2lUAA= 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 1619519559128780.4836694261276; Tue, 27 Apr 2021 03:32:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235859AbhD0KdS (ORCPT ); Tue, 27 Apr 2021 06:33:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:48270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237851AbhD0K22 (ORCPT ); Tue, 27 Apr 2021 06:28:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD4C161436; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2M-M1; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=wdynVwwhyvqKibF+xyVsNRL7Ix8YvvILE1Sgr+qtqMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldzIh2yqsG2c3vamAmCi5eaUWrj0yShSgybGRILHpqFXuKxx7hwuYFC5Lasq8a4SZ ofKknVNKaWNfzxiHHrE1JJrJGxJaQ/onsmuK7t1ccVgt8Vf44KofqeFgMjzY8ByzNa KhKnKC0WQc5qVcIcYTkzhn6Z9pcdNeAzv1RFH0+p6CyB8CQbpKZjRaIUHT8xeNUzUR kSihDTnCJhDR6U5FPxlAMxpWAKwG/ro+yTknznfQ4von6k1AKatPD+lLvcmrXUy8pZ U4pmBiItP1s3+MV21dxpriatiKmd4ISADk3d1XJIK2pmQ5DR5QYjGaEFZrxXF7CGJR 07BiyWqL5U92Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Robert Foss , Todor Tomov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 65/79] media: camss: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:55 +0200 Message-Id: <9eebf979608bdbd1780c226383bb084ff8041aa1.1619519080.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. Reviewed-by: Robert Foss Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/qcom/camss/camss-csid.c | 6 ++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 ++---- drivers/media/platform/qcom/camss/camss-ispif.c | 6 ++---- drivers/media/platform/qcom/camss/camss-vfe.c | 5 +++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index cc11fbfdae13..d2a7f2a64f26 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -156,11 +156,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int = on) int ret; =20 if (on) { - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } =20 ret =3D regulator_enable(csid->vdda); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/med= ia/platform/qcom/camss/camss-csiphy.c index b3c3bf19e522..8e18b8e668cf 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -197,11 +197,9 @@ static int csiphy_set_power(struct v4l2_subdev *sd, in= t on) if (on) { int ret; =20 - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } =20 ret =3D csiphy_set_clock_rates(csiphy); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/medi= a/platform/qcom/camss/camss-ispif.c index 37611c8861da..d9907742ba79 100644 --- a/drivers/media/platform/qcom/camss/camss-ispif.c +++ b/drivers/media/platform/qcom/camss/camss-ispif.c @@ -372,11 +372,9 @@ static int ispif_set_power(struct v4l2_subdev *sd, int= on) goto exit; } =20 - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) goto exit; - } =20 ret =3D camss_enable_clocks(ispif->nclocks, ispif->clock, dev); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/= platform/qcom/camss/camss-vfe.c index 15695fd466c4..cf743e61f798 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -584,9 +584,9 @@ static int vfe_get(struct vfe_device *vfe) if (ret < 0) goto error_pm_domain; =20 - ret =3D pm_runtime_get_sync(vfe->camss->dev); + ret =3D pm_runtime_resume_and_get(vfe->camss->dev); if (ret < 0) - goto error_pm_runtime_get; + goto error_domain_off; =20 ret =3D vfe_set_clock_rates(vfe); if (ret < 0) @@ -620,6 +620,7 @@ static int vfe_get(struct vfe_device *vfe) =20 error_pm_runtime_get: pm_runtime_put_sync(vfe->camss->dev); +error_domain_off: vfe->ops->pm_domain_off(vfe); =20 error_pm_domain: --=20 2.30.2