Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp621894pxy; Wed, 28 Apr 2021 10:38:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLI/eY1s2kx1r9okkKYy+vwFzaWWq36+WKlTqFxKq3vyKYUA3QZT1N3o6ICGW+3u8yzjpp X-Received: by 2002:a17:906:7257:: with SMTP id n23mr30883304ejk.412.1619631405201; Wed, 28 Apr 2021 10:36:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619631405; cv=none; d=google.com; s=arc-20160816; b=DM1btANYNk+U7IpCx1QhQyEq0Hm3Qmwjdl6zSnXooRycUA934g5Zq22ziVcGxmvPDk JtYZs5HVwzsmsa7j/w1KXk9pB4d5xpb0MQPJUtg0PtME04MXSGhNhxjQXc2tDRpn8IOn g4pVl7or0uh9c749Jxe2WuGbTfucYPovc4yIwPQHmY2jeStUjGVwBzodZxaGwRcYpBIp AEqb/WPrYrZ3VcHf9GEt4jLz2/ZRqSpXd1gu2AlPJI1APpxg+YypWuXjRkKe5ulIXQ5z FwlXFtC/MzqNlHjtXYjkwJpmhQZSCoFLxi1zsJCUwlozhsr0WP6BDYH992viUa79VbFv pH0A== 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=BJ2MEkQ7mUuch1DvXWr0IetM2hJYAvItD47E0vRIOoyJgQhIDcklpi8cMoBWpC+UjK 4e6+QRN0kODJ6hLuQbSH350mrNV/AV2AQ7Iy97LEYyeoH4UC3SMb4gB2gDu+PiamIBgb MdsV/O0BIo6DcsgkKyMIL6frGmmlvjSt+CvfxG7UdJ97i+fSYNUAKZhOeErZY/e9b+P9 BQU0Q5NzL6dkRTEe1RaOqXovV769Wh9W8hpB2jhiyDasEBKVSBY1AAp9m1Yl1etCX81j XpaXy5wLQJesP9NbNMrgoxSCN85wAuAVUPkWvWFcibgQbGzRX5pWCjIwMH4bF0YfZYH9 27zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=rqT4jrxh; 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 kl2si746570ejc.644.2021.04.28.10.36.21; Wed, 28 Apr 2021 10:36:45 -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=rqT4jrxh; 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 S240096AbhD1PA7 (ORCPT + 99 others); Wed, 28 Apr 2021 11:00:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:37052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240476AbhD1OyK (ORCPT ); Wed, 28 Apr 2021 10:54:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C437B6194D; Wed, 28 Apr 2021 14:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619621565; bh=jFh5VbnuBrXc2tgtFwOIhvEafKERvRJMCTg4uhxmLFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rqT4jrxhHzyLDsERiaJS6pfq3zWDtC8jYX0I9hy9y8aGAxbQpcLOlBSCVX4NfJ3Lm qzUd0yLlv9e8uuWIUYMBDusv5/tPo8c53NKHeBS0papQf/xM0bqPep8ErRsx6XcWny u4hHWVLi3OrV09uSfyGjJIPTJwYGKejFUhENqxAACS9QBctKxzWj5hisUZFr+cYsEK GDq6x2beHMpln0uVCVUyeT7iO3IucWs41LF/ZYRQcQx7PZzdCuQ6L2AWtUK1MJEblF ZOk/oI8z3FqAAqw2ZY14O+E9FpiF86C6dqDd3Qk8GuBQMDFU5URJuZt0qEIfN7RcBX 1n0mQfxD2r66Q== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lblYR-001Dt1-L6; Wed, 28 Apr 2021 16:52:43 +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 v4 71/79] media: s3c-camif: use pm_runtime_resume_and_get() Date: Wed, 28 Apr 2021 16:52:32 +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: 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