Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1650348pxy; Thu, 6 May 2021 12:19:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEPKdo8+svJ0n063YCeTGJYdmyVEmwwQOQ571e++TU9DIzLS5aD8ie9zmYCRuKDqksWYiB X-Received: by 2002:a05:6a00:78e:b029:28e:62a4:5f3 with SMTP id g14-20020a056a00078eb029028e62a405f3mr6296653pfu.19.1620328790853; Thu, 06 May 2021 12:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620328790; cv=none; d=google.com; s=arc-20160816; b=kkZwQur7fTk4DVttY591rAFN58fW9l7LM/4xjrdowdAnNWwqd9szEkTMeOUf9NZEXE MTpMq60rD7uED/oUePamKtxLG5J+lDwe6iN6f1Hbu2veSG05jTUaxODZU8xvvntp/6Vy NyvisFOpEpiX7WYRzEy3M52qUBjLoT3RhoJbAYYjU7gOYDiR2S4ZgvvDjbtZxWsZAukl nAGdtPVvOMhc0JnbTXsoVDIHf1saGvqPnqgI6Wo4beD9ZdP4xRPxe5aFpj7rHZGDqf5a J+8/U6tFXLLhpYvSSPr6jqQfdAXnpZ82NVXDtcuzmhThZxxI+/nwUj+9GmUpF7oyC0cs 4m5A== 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=zCq7d3MNr7cmKY782dud/XiJT9d5tAT33Kv6n7YZWng=; b=jSO0vZlJxyAWsmy5zEPa1S+Go5BbXCXFl3hCbxSc7Rh/TsYww14Dkyh5fF99j6S46K b8nkkCmKf0sVsjqZz8JNmJnkbrGM8wvg/06qYHu90SdZMwtQvEQz+QLJE+1tmmghhvPB 7BnkAmFzznz3qVoeoqsEBTPtxlxMd6Kvx3Jgw0wlHxjQB/CceU8QmEmRZPAwi7l3nu1O vbGuO5Orv3c4SvfGrICGQoZhlSt+1fIJggqlush/amY/9YhKKj8dLiYPQmKwY76OXgkV DN8unjdBiDQtOwfhN6wbkg6L64EGVcTGBbmKtkQuz8vd/8ryzj4F3tELJem002dokNrw OCFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=gQ+EcUNz; 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 l10si3692999pgb.331.2021.05.06.12.19.35; Thu, 06 May 2021 12:19:50 -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=gQ+EcUNz; 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 S235675AbhEFP2P (ORCPT + 99 others); Thu, 6 May 2021 11:28:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:40888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235326AbhEFP1m (ORCPT ); Thu, 6 May 2021 11:27:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AC77561943; 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=jFh5VbnuBrXc2tgtFwOIhvEafKERvRJMCTg4uhxmLFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQ+EcUNziXJldC44cpFfwrxjpi3vgg891yyIz1m2ZwRSEjOUjKbObc7e9Btk8f/MR DxJ4XFGfBGrkQsXYvtBhnjaxT7DjbiHPJiFmKnmKmWn2WQn/FqKFYOMO3VkLe/a9a8 KU5xdawuNarZygF7ewP+L6Eddsy2qf17fUBz0WVNduBZLYAh7ZR8X+KVqKZz3xqpho Cj32oT3oXqvalfuGHW1YIKkD1ue30rHLHo9CDaDu23KU5wkVnKrIaI5iP/wzGnPbvX 7dq9aNlSL/jbrmn6RM/8EcCsVUyDHKHQmv7ONcw8WX3nMJAMt1rInW9jy7V0CprGBj RRUFayVciaTFg== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SCB-82; Thu, 06 May 2021 17:26:06 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sylwester Nawrocki , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v5 18/25] media: s3c-camif: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:56 +0200 Message-Id: <40b44b0945e39b7633b31c6c6e27c7d701dc2691.1620314616.git.mchehab+huawei@kernel.org> 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: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/s3c-camif/camif-capture.c | 2 +- drivers/media/platform/s3c-camif/camif-core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c index 9ca49af29542..62241ec3b978 100644 --- a/drivers/media/platform/s3c-camif/camif-capture.c +++ b/drivers/media/platform/s3c-camif/camif-capture.c @@ -547,7 +547,7 @@ static int s3c_camif_open(struct file *file) if (ret < 0) goto unlock; - ret = pm_runtime_get_sync(camif->dev); + ret = pm_runtime_resume_and_get(camif->dev); if (ret < 0) goto err_pm; diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c index 4c3c00d59c92..e1d51fd3e700 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -460,9 +460,9 @@ static int s3c_camif_probe(struct platform_device *pdev) pm_runtime_enable(dev); - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) - goto err_pm; + goto err_disable; ret = camif_media_dev_init(camif); if (ret < 0) @@ -502,6 +502,7 @@ static int s3c_camif_probe(struct platform_device *pdev) camif_unregister_media_entities(camif); err_pm: pm_runtime_put(dev); +err_disable: pm_runtime_disable(dev); camif_clk_put(camif); err_clk: -- 2.30.2