From patchwork Tue Apr 27 10:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 12226087 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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 64FA1C43460 for ; Tue, 27 Apr 2021 10:30:34 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 08DAA611ED for ; Tue, 27 Apr 2021 10:30:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08DAA611ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iQ3GoKXd52fl4kIgF5ZnZdPVBTNLdr0gXR3cQwcKg0A=; b=RmPKX3l2ukjV7iKWkeJJYtHLa hBVbv5IBEt45ATEO331V2exjXXiCabTzCPbBy3yIhh5JwHn4KRD/XfCONHge4yCRc793Tij+NIFFf FxyIw+2QDUwt/xxE/gamCCavqUXyePOcud9pbzLQTT8GFEzrGVTMIvSEXDe9uIYgQihp6tFwKK8th qm4Wzv71A9G0WsjdZpbvYC1n4UvBa1dXcVjsrWDV+TQwSlMVSglt/1HOzS2qYgadq5cpYLwSE3UtP LOpZeit7cZqVgjlBmaJQ1NdJVOtwxV4ku4f3RecSbjK4Cbpp6u2qBEDoKxQPFVygRAlUfiPOCGs5F TWrj45h7w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbKwQ-001N6F-Qk; Tue, 27 Apr 2021 10:27:43 +0000 Received: from bombadil.infradead.org ([198.137.202.133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKw6-001MyI-Fr for linux-arm-kernel@desiato.infradead.org; Tue, 27 Apr 2021 10:27:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=sXS9N7lOxdaSuaR1jnhTDEntcWdQ9KSZnVkdsdKbNS0=; b=FJLk1X76jiN/qbbPMFuECsN1uB 3iMnK2ktKKzFZKaZUJSE8M/b7Nzy75S9OycLGAktnrzTDMsWV7G4D80Ye6kRgJ2PiC5EhXAdoAfmJ iOxVJ0KfuDEd38uizEZtdtPWuj0w8kOjdUPxcazZwR2+LfOFEnqiBAucfNblBdBgomo9W6789lMMd Fcggft6Alp4EkBK/46oD2iV57VVKBbzO/FUFumJjBugvu+HzqM1gUq/Xom+52ca18CyICU4xvbe+K r5swY2wp9zFsyCdSEYXLXqcK8hdDqeB2tOHzrQe4lA5JIm1vOlYwL3/ea6XEzy1rc6betrqHYV3vi DOfsVYQg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbKw2-00Gd7o-Ha for linux-arm-kernel@lists.infradead.org; Tue, 27 Apr 2021 10:27:21 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06AB1613C9; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=P8ySBvxIssOsYGuosUcRi8p/mrvcDEnJfSep5KVO8S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WMkCLvyRBYSYTkhDOyp4uEi+XyTwkxe4+r00fVlVDME2C4PbtgKrgOGwIP61fbThr TZqAO6mrphnoVFdSRn6D7hSY3QHjYrGcCkX7anEx7b76HWe+A/3fyMOI58a5h6S+M8 KZNl70IzqQkfBl8iHVhmfD1cibe9wavoXBLsQV46Vy3ku8oNqBV8An3jv90pGR31P9 TDGLviO/kPHmmeJEMnc0rl/ri0NPt5WwGHqYvONhp18vF4dntXQotItmqXyuIAHdOR MyHrsn5zZQF6be9pQcCKpwagOZ1N0RlzONmzArOr5z9kfrQPJo6awblllhlTErYuR1 o8a3qdZ2K5sfQ== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0N-6t; Tue, 27 Apr 2021 12:27:12 +0200 From: Mauro Carvalho Chehab To: Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Chen-Yu Tsai , Greg Kroah-Hartman , Jernej Skrabec , Mauro Carvalho Chehab , Maxime Ripard , Paul Kocialkowski , devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:14 +0200 Message-Id: <991f59e8ff469c6b0e410db2aca6a1d3885b03d8.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210427_032718_655098_C649D97C X-CRM114-Status: GOOD ( 11.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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/staging/media/sunxi/cedrus/cedrus_video.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c index b62eb8e84057..9ddd789d0b1f 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c @@ -490,11 +490,9 @@ static int cedrus_start_streaming(struct vb2_queue *vq, unsigned int count) } if (V4L2_TYPE_IS_OUTPUT(vq->type)) { - ret = pm_runtime_get_sync(dev->dev); - if (ret < 0) { - pm_runtime_put_noidle(dev->dev); + ret = pm_runtime_resume_and_get(dev->dev); + if (ret < 0) goto err_cleanup; - } if (dev->dec_ops[ctx->current_codec]->start) { ret = dev->dec_ops[ctx->current_codec]->start(ctx);