From nobody Sat May 10 05:43:24 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=1619518633; cv=none; d=zohomail.com; s=zohoarc; b=J4v4Ferhmp/GLPOb9JSfItEUDNyUbZStita2N0B4rLn9HsmlnfK9QCPK/VVugYaAe0c39RoCgVScL9eLoNoJGdJ38uTalGB/Konkw8uKD591QXGyhXPAZRxsdvRuculqpUnTZlbQkVHewITD3pNd+wFdWBuuyaI6n2aOMoPLQHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518633; 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=CD2kIV2H1xha6hSam41Bi9fCRUy6duc5zWo3/Xa1rm8dvENT3gHcQZ9vJ68qKpBOHxUwylimp4jNfg292XXNr4YbTZRbiRavffj5ZLSxCakAS3zP7hKssamUBhESsQpIShLSBWf3EEESXVFwQDA7g4Jovf9fec+gdBuupHTfg/0= 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 1619518633870331.9613156722387; Tue, 27 Apr 2021 03:17:13 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238053AbhD0KRy (ORCPT ); Tue, 27 Apr 2021 06:17:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:35146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235491AbhD0KOm (ORCPT ); Tue, 27 Apr 2021 06:14:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D456614A5; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6u-Jh; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=5KztMjooOddzA79l4hTCyOZrgNAAq7qVnwZ9IgWgZxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DN/EEkrHoXuh3/I3c6wzYcjMy0F3HBayNqM1dvtvbw4jPsHVLCUoL0muaU4VFAVkq TvRKXsyn5/Wo7RCtFHkRUdkp8hwa+yAG1103TSzC6UiIDnlgWFcKBUb1jcPsz9sBgT uAYMu1oU3hYI6eoN+8w08l4uNuVIam5N1QPukWxG5VYXT6HonoMNJ1yOhUxnpSdbTG JjwCE9n14sfltYD0qUaXGBanrsBgWTeZr+u+8lWR/0x1QHHbT/uHftgsxiek9CSBFf lEdrz6jMruSlXE2TvPqPJXGtLqXGljaBEeycxTj/yOXObcAFhq2JZpb5mlMaaz6tE2 lcqmK1HIaHE7A== 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 v2 48/79] media: i2c: ov5647: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:15 +0200 Message-Id: <4edc3d28d3cb8985b012d1a1bc47d5f562565fe2.1619518193.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