From patchwork Tue Apr 27 10:26:45 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: 428137 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 00D04C433ED for ; Tue, 27 Apr 2021 10:29:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2460611C1 for ; Tue, 27 Apr 2021 10:28:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238392AbhD0K3l (ORCPT ); Tue, 27 Apr 2021 06:29:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238032AbhD0K2d (ORCPT ); Tue, 27 Apr 2021 06:28:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D8D3A61440; 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=1619519237; bh=oAi5YzlfFlQMfzPh3wYGQ2xjGcqBCgu57W3dE0PjRzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TA2KxyjYBmz7VGpPQfs1ZRA4qhA4C4EgrYpYcsSpvGfskc+qgJBZ785pDjbGxOZVt 3ji4e62BCGNQ3efEw4jZl6otpQTKjR2knN1t23/06Ke2ew+0dLkz2F4OHsIyYP+sqo m72KAZqTKQdgmEC2jzezKTjMoopp7pBNfo6NepjzgyjV4Sb4qLlyuXx2wuqQZZznE+ o/rdK1IH7eMlSAYysBjGsGpePe64H5L3TFRhpRZ2+T+JuUi8hOykq5MofI7PwOA8wz wU03ZSBAZJ+pho4UxbGLtiOQf8iCH2/Ju7O6YTQOTU0nW/9fixJHb1fknA0SKlncib 1U4OirlwahFdw== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o1s-1S; Tue, 27 Apr 2021 12:27:14 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , =?utf-8?b?S8OpdmluIEwnaMO0cGl0YWw=?= , Colin Ian King , Hans Verkuil , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , Yang Li , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 55/79] media: i2c: ov8865: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:45 +0200 Message-Id: <7984a7e594be7b812ebbcef913c34770608fbe4d.1619519080.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/ov8865.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index 9ecf180635ee..3bf6ee4898a9 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2497,11 +2497,9 @@ static int ov8865_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);