Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1642321pxy; Thu, 6 May 2021 12:08:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpXG96umcKY9dZKtLcjnDFwTfVzUW5MYsZU0Hsbth3AF8jCrPPRrNTXBIv/WFyTQBWxO18 X-Received: by 2002:a05:6402:b2c:: with SMTP id bo12mr7147202edb.196.1620328123508; Thu, 06 May 2021 12:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620328123; cv=none; d=google.com; s=arc-20160816; b=ByMP6rjI6ctk8BTL69el1fnIkakIObzWn9EN9ZBnfIyNQhYAwykF+e5uxSMIYE5ZaD dSI7gMyn5IswnM4gry3Z6R/AKDGx+Z7zfP9Za3a00KXGpqbZVVCxj0NUNw1JT2vwhAXv 9DGukBiUdzRP2DOBVoGrMk5Jr6s6Pinmc1QuKTzfeice02NtT5tqI/N5hg4SgshLJONs B04JwoBYixw5NwStdKsKGCq+6jdEIrlthDAqumgh4hJSQOPc+oKHckg8W6Woz7Dk2pS8 6NlrzgZ4tnvDyZs1V28gozUpCe1vDc0MphNK8zCBc6LWFBHZ/KjEjjsqFbA1S1LjHZJC rQUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=uIuBJmF0HMMlsWHg0vzZdGoLC6Q8BIvrlc0MUDc9Jqg=; b=zCm3A5vlKZYeBT4Xy+VfXvXmVAbvE6ethn8eymss70dlYCphW648B0n5Qh5UlJxhZK 2vl/SKRMg7jMQTvXanM6mWIsTtzvqG3qrt9f1RTu+cazJuN8qGtP6SBpe+IxtVoKmmV8 LW4aOFmRTHqxTaogcUtvsU6CcN3nPP8PbQylUPB2sXmPi9BiRfYivjNXSkMRlk5Jryii 01PPKHkbNTZJAWwc5S3iW4JcAqyEgoh95UwXAPy4gZZFvXeAFuQ1B9pabz9MEcm9xM0P FDPfb3axJPKzGFuod4hJMYT1nPzfid+slwp1cRoKaPVajx7nHYNmgLop3u77KQfZ7Ll6 Ko6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=FZA9vxsV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cb3si3199833edb.209.2021.05.06.12.08.19; Thu, 06 May 2021 12:08:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=FZA9vxsV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235699AbhEFP2i (ORCPT + 99 others); Thu, 6 May 2021 11:28:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:40894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235397AbhEFP1n (ORCPT ); Thu, 6 May 2021 11:27:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B5D566194B; Thu, 6 May 2021 15:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314783; bh=wdynVwwhyvqKibF+xyVsNRL7Ix8YvvILE1Sgr+qtqMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZA9vxsVPgowDNDMECE5SIhOIlVa0SllblA1ErFoi7bSAHC3VEnKWHfTbWdCRwZQ5 Tap/RCoJiKXB5/1H87SejKwxRTv5zL6eerQvJCpfCFLnjdQiUwPtKsx+PZ7KsB6W6V dfXefOJOFcvkOWOu3UDsR9PmiNbiP7g6zyWYz7CraESJe5IQi4EoNTj56mYXgOXxjp fv6GQcaZe0J1O4Ugt9Z6sCPC7i0oKerjWcfOJ3NbtHhGCEu7IyHLGAxl/ev+ctg9KS YzLQhHGHsP0wWYUvKYttKnrjWrGI+FM+RJSYsmAzLUki/ItZIea4v6z1yxNaqeobgM q9rg4Dkm5NaPQ== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SBn-1K; Thu, 06 May 2021 17:26:06 +0200 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 v5 12/25] media: camss: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:50 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. 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; if (on) { - ret = pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } ret = regulator_enable(csid->vdda); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/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, int on) if (on) { int ret; - ret = pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } ret = csiphy_set_clock_rates(csiphy); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/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; } - ret = pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) goto exit; - } ret = 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; - ret = pm_runtime_get_sync(vfe->camss->dev); + ret = pm_runtime_resume_and_get(vfe->camss->dev); if (ret < 0) - goto error_pm_runtime_get; + goto error_domain_off; ret = vfe_set_clock_rates(vfe); if (ret < 0) @@ -620,6 +620,7 @@ static int vfe_get(struct vfe_device *vfe) error_pm_runtime_get: pm_runtime_put_sync(vfe->camss->dev); +error_domain_off: vfe->ops->pm_domain_off(vfe); error_pm_domain: -- 2.30.2