From patchwork Thu May 6 15:23:16 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: 432356 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 3EF14C4360C for ; Thu, 6 May 2021 15:24:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C0B361177 for ; Thu, 6 May 2021 15:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235348AbhEFPY6 (ORCPT ); Thu, 6 May 2021 11:24:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:38246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235209AbhEFPYd (ORCPT ); Thu, 6 May 2021 11:24:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B1B0613FE; 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=30FDfGkSRFbi6myOhgI3rDKaVJ2tBblGkl0/ENBmv/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oudc2NJojYJrxlB7Sngd/MB/YPMuCV/Wy71jhID2TrHJ1LEQLfURAvUj4+mueNWfs u+xfHi5b4NcbgtX4+fzej9gq88Mtkp7mA/O85EybNkVMLZ1Sl7ie1/3vO3E9pnpuWo mMXo+QBjAEjHiAWxBP2jPTMqVOhm0oI84Brkhd8DS21VQ3bnOC5OugEJStjVdpJu04 0k8xAX0yb4dZ2wCk5n0QfHzjXfoSAD2ahmLrj4OFP9qSWZ+qe674cf7P+2W7eiMga5 qxU43b62ON5CpZpBQwpPmL5xTjdGPj3TDE/JxKKiWiLrn2JEHxxiWDQ3ObolRvfuIQ 5BxivW18Q0ZAw== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lefqa-000Rvq-MO; Thu, 06 May 2021 17:23:28 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Colin Ian King , Dan Carpenter , Ezequiel Garcia , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v5 20/30] media: i2c: ov5648: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:23:16 +0200 Message-Id: <503e30ad17f1c5b72ee5413d13ce31e4de4c705a.1620314098.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/ov5648.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index 3ecb4a3e8773..07e64ff0be3f 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -2132,11 +2132,9 @@ static int ov5648_s_stream(struct v4l2_subdev *subdev, int enable) int ret; if (enable) { - ret = pm_runtime_get_sync(sensor->dev); - if (ret < 0) { - pm_runtime_put_noidle(sensor->dev); + ret = pm_runtime_resume_and_get(sensor->dev); + if (ret < 0) return ret; - } } mutex_lock(&sensor->mutex);