From patchwork Thu May 6 15:23:20 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: 432354 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=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 9304DC433B4 for ; Thu, 6 May 2021 15:24:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B55861289 for ; Thu, 6 May 2021 15:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235367AbhEFPZD (ORCPT ); Thu, 6 May 2021 11:25:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:38282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235216AbhEFPYd (ORCPT ); Thu, 6 May 2021 11:24:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C4E386141C; Thu, 6 May 2021 15:23:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314610; bh=1hLBMVYTJOCW5MEqPMZGaS4TnBgfP7FzLvbrbNFMiSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=udizQGD4ai/tQ1BxOZoR4X528UYy3XN8y2udgEPvmvwLkJT13xQ/KNKJL7JTOlZbW Axy0mZR3LkF+9s+jNqGPQSq+0HNi2DxShqHkO/478ISY/tL3W3NGJJzebh2NcPohm5 v8GdlcwEJQhNIaA0NVMCXJ/PtGxUP/tvSkMygcMw+BPXGGABbJyhum/7WHOHgkmyE3 zxewJsbVWpsw2DZymJnb3latgaHCKDiGwjAaT3Jjs90zMkSH39YFKW1mlVuhoU/oMt dc6uc0jqwwUX9dTGR29GZJRD1TLszjuycOO0GwPbrFib5m7MonwMWIqk62Y1VKGRGQ 2/VdZf9lYEZEw== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lefqa-000Rw6-Rh; Thu, 06 May 2021 17:23:28 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Wenyou Yang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v5 24/30] media: i2c: ov7740: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:23:20 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-media@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/i2c/ov7740.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index 47a9003d29d6..e0ff6506a543 100644 --- a/drivers/media/i2c/ov7740.c +++ b/drivers/media/i2c/ov7740.c @@ -624,11 +624,9 @@ static int ov7740_set_stream(struct v4l2_subdev *sd, int enable) } if (enable) { - ret = pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret = pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } ret = ov7740_start_streaming(ov7740); if (ret)