Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1463453pxy; Thu, 6 May 2021 08:27:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKLdqE5fUyy0dbxpIw38jx/0yIKKATbG7aF6aqVYb30vFu4Bw4T+Jl9r/BDg59oDwL6hgZ X-Received: by 2002:a63:a64:: with SMTP id z36mr4809728pgk.342.1620314868960; Thu, 06 May 2021 08:27:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620314868; cv=none; d=google.com; s=arc-20160816; b=XazHUHM0db+KVa/ZAdObwcf2BXwDf9GmSS7T7G1iRoo8ArhSdSg8ZHg2vJYhC4PsF5 9ttUeax44eEIvi0mhWNjhSKDH27LYZJLvqmhqBaOf+AgA/G4UHFV5G0DCxXi8dgSAq+7 SBDZ1AWrlxf4XOq0plZI1bkseZNs20/U/LGmAAXUgVpjvnmGofaamyURuYtdvFQFwTG7 oskrxhOlklED4JzEsjmnJe+k9pZkYO3FLLPdqBnTdhygTf1JY/hND6lA2ujxmyXAAdG8 etPl0++HRZKTb7rixFipbCnUcFOVYZMCEixRCskw2VJRCMSt3LRjaNUcH/AuliFj84t2 T46w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=MemQBCMDmE92SA4Dh34kjM0Xf+mWVXaAaIa5OPfJXiE=; b=A9X3J561W5q4ZwXdz2A5Iuz4B0R6o+sxNVBHyzghpntTBZ8bLysrEcSf3PSr/05h4e 6Y/eNvjnVae+zUFSFSY1CCJPl6TJMRzcJ3vSLk6DwLQN8kilJ81c2RWUQtLq4V6WpvVw wkleC1btChfwvo+iUaMmuhvgX2YrPL11r4gcQpXeqeLTWc+z5LZJQ/+xp6ffpxcQgCcZ nPry5oeThZ4d9ZdMMg0WBru44BwhGPrXS34JKAYe5hN1h8VBn1cgZe8Xxg5xKetg1nZY lQaBc2png8cqy/T5IADlN3t8e/wUKhbBBktP4CSWsWq7TWPN6wZbI9QWOdFrp0tRsAEo hTOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=vCnzn3Ee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j5si739942pjl.96.2021.05.06.08.27.36; Thu, 06 May 2021 08:27:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=vCnzn3Ee; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235453AbhEFP0w (ORCPT + 99 others); Thu, 6 May 2021 11:26:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:38280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbhEFPYd (ORCPT ); Thu, 6 May 2021 11:24:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D232361423; 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=nHZL/8LfEY59F+jSTZXbI5IsJhAvjS0xN6pbKcv/Zf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vCnzn3EefAS6OJ0ojXlBof9/Um+5ehG6wridu2MaMlanV/rl/YYLLNH0U5ilUDkwN f+ETGwD2Eyyj3YN5amOJb4V+MJEgRiMJPuKa5wOplwc10wWd9dMTHqJWvWcGUyqQtP +zxm+41R3ukVSAAuoY/kYwMOtyGzJBhx8UjM04KXXZ1uB7gp6bc3T6nbCg3z0cV/GP LHI2BxYqoNLU+XJ8P5AH8fSzj08J2jYm2Y1mGUIvYyBkkdFtBAriqHROVJhsIAKPJU vCwABEEhqBdHQptJrG+u0PRT/dDvr7QkWYoE73VIPJ9x7x9as2fwPFCyLoi7tF1gFT q8aU1KzCSgpzg== Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1lefqb-000RwM-0k; Thu, 06 May 2021 17:23:29 +0200 From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Gustavo A. R. Silva" , Chuhong Yuan , Hans Verkuil , Jacopo Mondi , Krzysztof Kozlowski , Marco Felsch , Mauro Carvalho Chehab , Sakari Ailus , Zhang Xiaoxu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v5 28/30] media: i2c: tvp5150: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:23:24 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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/tvp5150.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index e26e3f544054..374a9da75e4d 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -1448,11 +1448,9 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable) TVP5150_MISC_CTL_CLOCK_OE; if (enable) { - ret = pm_runtime_get_sync(sd->dev); - if (ret < 0) { - pm_runtime_put_noidle(sd->dev); + ret = pm_runtime_resume_and_get(sd->dev); + if (ret < 0) return ret; - } tvp5150_enable(sd); @@ -1675,15 +1673,7 @@ static int tvp5150_registered(struct v4l2_subdev *sd) static int tvp5150_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int ret; - - ret = pm_runtime_get_sync(sd->dev); - if (ret < 0) { - pm_runtime_put_noidle(sd->dev); - return ret; - } - - return 0; + return pm_runtime_resume_and_get(sd->dev); } static int tvp5150_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -- 2.30.2