From patchwork Thu May 6 15:23:12 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: 432359 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 DC467C433B4 for ; Thu, 6 May 2021 15:23:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBA79611AE for ; Thu, 6 May 2021 15:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235300AbhEFPYx (ORCPT ); Thu, 6 May 2021 11:24:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:38208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235201AbhEFPYa (ORCPT ); Thu, 6 May 2021 11:24:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 646A1613E4; 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=oKyS61glPZn5sXxnrboa/AtTlnD1fG/1xuau3yVfL78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3COkbEQio84liZvUPD/J3sUZsnfuPrbg5MZknOresXKFtUmxMuZxFvoI/kS6yy6Z a6nGESFr4PMEFiV9zu1onxngOe/kuoyvJGX1COR+hIC3s+mWrsGQeThD/uy8ENUdCR adk1WUekooG8SbWcZ49+AcUZjo4o3DZ6XPdy+KWTGw1lLQsOtG86KQNcchRRqfIbYC AFcioGeR02XmDJrdM2o+NJCs0FgZjafED8Am/bzE/AOMDzltaSUbeQ4yefJHRXkf7f enWuikh/i3jFea7Psx5mtItnTwckemveGfu3j+2AUvd3HRaqgCUKDUCdWSlCFpzUw3 Fe9OpzU7UxL/w== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lefqa-000Rva-G9; Thu, 06 May 2021 17:23:28 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Lad, Prabhakar" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v5 16/30] media: i2c: ov2659: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:23:12 +0200 Message-Id: <6c19955672011ff88748e3314e984a39504d1622.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. Acked-by: Lad Prabhakar Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ov2659.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index 42f64175a6df..a3c8eae68486 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1186,11 +1186,9 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on) goto unlock; } - 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 unlock; - } ret = ov2659_init(sd, 0); if (!ret)