From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D87DC433B4 for ; Tue, 27 Apr 2021 10:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5662613C9 for ; Tue, 27 Apr 2021 10:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237889AbhD0Kb5 (ORCPT ); Tue, 27 Apr 2021 06:31:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237007AbhD0K2R (ORCPT ); Tue, 27 Apr 2021 06:28:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9E4516142C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=xptLiLCkGNJuz7QvbfWAgofgWCEJyWuHFXhmxlDN2vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZ3ZhFUjbTS1iMpeVcRn4Y9ddHEha8/IjDjXzCeJTgj8gJuYEIht+yvo559v2hl7z 6VtjihmxZOyRF2q/CtMG1YyXVDsYo/D2MJ5kTp46EI/t9Qb67Dewel0RikOKsq+i2p 4tX0X6aNe71mjqWBJ1IplJKlMm7JnKJplalklKyTbYBXGGjWrAp8H/df9Rgdzb5okL jV3h4UCm48GAHsQmPbjc18kkIjBco2Nvl6P/AXhX9uKyabRrKpD1Js1LGD2pMgQTEB j4a/9tIgTSJn5y9cVNkYUiRE42l1vXuajC4tN+2X0sY/apXbBIsqmdBBN/BK+ixdd3 hm+CZmNQ1nyDA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2A-DU; Tue, 27 Apr 2021 12:27:14 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Philipp Zabel , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 61/79] media: coda: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:51 +0200 Message-Id: <18b66005a971b96fd50fea61da138a1bcc68bd8c.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: 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. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/coda/coda-common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index bd666c858fa1..13ff05e7d850 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -2660,10 +2660,10 @@ static int coda_open(struct file *file) ctx->use_vdoa = false; /* Power up and upload firmware if necessary */ - ret = pm_runtime_get_sync(dev->dev); + ret = pm_runtime_resume_and_get(dev->dev); if (ret < 0) { v4l2_err(&dev->v4l2_dev, "failed to power up: %d\n", ret); - goto err_pm_get; + goto err_fh_del; } ret = clk_prepare_enable(dev->clk_per); @@ -2709,6 +2709,7 @@ static int coda_open(struct file *file) clk_disable_unprepare(dev->clk_per); err_pm_get: pm_runtime_put_sync(dev->dev); +err_fh_del: v4l2_fh_del(&ctx->fh); v4l2_fh_exit(&ctx->fh); err_coda_name_init: -- 2.30.2