From nobody Sat May 10 02:32:17 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619621838; cv=none; d=zohomail.com; s=zohoarc; b=DkWtOnBptz06+hZoBKLYp3vxxdI69e/2SpJmuuomuy4vCPjk+HsGcjXAQGQaInzUdNEqYB2ekf4b5yCgXf/HwenijrhnX8n9iMcqrY63KcY/UMhLtTpAjHxdwqmUUyEnCN5l0ZPUaCQMk5Vwk/a6lzjcd2D0NHLY0hR3k7N0qWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619621838; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fMPnqzv8RyB/pFyrZ77/bX9UlLHM2eXfJsmxW+ioCL4=; b=exOvBc95Sq9dpSgUaieAtIxoblKHNZU9cGmKiM4oG+7NwAtIc5Qd2KqAPMkhewHPcnjrcW+lCnly1yAB/XGSspM7/Xdz2oNLiuFzsrKrX8LCTC50pa7lWJiuG2lWHJaslFKWXaFQWVyElErB8udpX/dkEcg63lDR+HLa4cgSe64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619621838721794.4647570488477; Wed, 28 Apr 2021 07:57:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbhD1O6B (ORCPT ); Wed, 28 Apr 2021 10:58:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:36784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240407AbhD1Oxt (ORCPT ); Wed, 28 Apr 2021 10:53:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DD4AB6195E; Wed, 28 Apr 2021 14:52:44 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lblYQ-001Dro-T1; Wed, 28 Apr 2021 16:52:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619621564; bh=5KztMjooOddzA79l4hTCyOZrgNAAq7qVnwZ9IgWgZxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahmwxtg3NgVw85eqHO+0GHvc/GzU9SQ14ckCypEmh++q1GjZT6DB16z2v+Jy9HoFJ out4E2H4ma4+Th2HSG68e87BgrAA5tdjR4wOfenzvbd0pcvW6ZYrKHtk53h5INJQZl OExON+UxCqsVDYy7l6zzRItwuS3QM+IlMCHWRq8QClKKCSY+J+JSpxT82ErIvxhsOh YNt6SULpTdpcyZqXwBkf/mqlTQHTz/3AaxEySXV3d/T7e1PMIb47R9Odg5mUXGOL+a mZ3Vj7qCJFidnT5yUGXD89b9IrqsdiFrmkltc6MhlkmtpJg24tJdQRysVmaSEb8px+ sjXeYKcSC1yjA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dave Stevenson , Jacopo Mondi , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v4 46/79] media: i2c: ov5647: use pm_runtime_resume_and_get() Date: Wed, 28 Apr 2021 16:52:07 +0200 Message-Id: <94e1540b6263c3ad4a95495a19cfeebe45c3295b.1619621413.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th 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: Jacopo Mondi Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ov5647.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c index 1cefa15729ce..38faa74755e3 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -882,20 +882,20 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, in= t enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) goto error_unlock; =20 ret =3D ov5647_stream_on(sd); if (ret < 0) { dev_err(&client->dev, "stream start failed: %d\n", ret); - goto error_unlock; + goto error_pm; } } else { ret =3D ov5647_stream_off(sd); if (ret < 0) { dev_err(&client->dev, "stream stop failed: %d\n", ret); - goto error_unlock; + goto error_pm; } pm_runtime_put(&client->dev); } @@ -905,8 +905,9 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int = enable) =20 return 0; =20 +error_pm: + pm_runtime_put(&client->dev); error_unlock: - pm_runtime_put(&client->dev); mutex_unlock(&sensor->lock); =20 return ret; --=20 2.30.2