From patchwork Tue Apr 27 10:13: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: 428188 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 B75F6C433ED for ; Tue, 27 Apr 2021 10:15:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B03B613C3 for ; Tue, 27 Apr 2021 10:15:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237658AbhD0KPr (ORCPT ); Tue, 27 Apr 2021 06:15:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:34864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235540AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AB6BA6157E; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=jUMHPV3bIyEEarOloeBBF8gl6HQ5pp77fQglK6LRWcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIb7+lce1FnQh5HyJ9fE7hXJYauthNRRWT125eY/rKxqY4mA5g/ayIzEvuax1XvIW CYllTa6MKMaThVXXVDxCTMr32RKUTi5SVfSR1OLFrkOWX8QrdvJEO3Pc2cLIl5+Kk9 Tr5PHldCihlHiNqZDzoWJurSqXtyBwANLW8cPNXzxOQanPX8rAgQwZhLQ/aY/DUZ2B fIFS1HoKXg5xG0OWpGjAEEt6t/H2EkxTmmN/FVua/Xt+HJAXXsc5lx4i1R1D35OXv+ bdnbYOYbDcsMZzEhZIZ2ayHEHUm9lsfCehQbeajUBzIOdBBup6roz+JLCkGyRn/MqM 44L8p7lkMtTbA== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j79-T2; Tue, 27 Apr 2021 12:13:50 +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 v2 53/79] media: i2c: ov7740: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:20 +0200 Message-Id: <1e08b1b29b49c9c390d29718328f6e53c9310798.1619518193.git.mchehab+huawei@kernel.org> 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 ed6904b2e8f5..74219f67f245 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)