From nobody Sat May 10 03:27:42 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=1620314869; cv=none; d=zohomail.com; s=zohoarc; b=Rs+tK4PeTHmyVhXuLY8B24Ss5Bsg+Sz6+DXFLH5JwsEafX54H0YI7fquagy7OGVhefbHa40JQTYvMVTZszVf5Z5v4tLWjdJOUxQmFImyMYFztqfdlgKtoxWry0gJd7Ef/vwkWKi6zmJNblNzX/Pb5VjopOXOBKP/a95IJQISHl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620314869; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ibdjOd74zn5QWbuSye9o2gRXEdlT/fUXvhYWQjU18O8=; b=IOBvRNigO5+7hSRfjmtmF8VTATp/iwwTquh691WHCEwAo9YgvabEVKnWme7DGKzzvjpoems5SDUcu1DO963CBXSnAYamoDvK6SZwSZTo3JdxuHdG8dwlM8YgT2WwN0BYB5q//1JWdAbT7WY5RPmKeaA/LM2MZP9pS6FBiVzKfmM= 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 162031486975135.368481330067766; Thu, 6 May 2021 08:27:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235402AbhEFP2p (ORCPT ); Thu, 6 May 2021 11:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:40898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235414AbhEFP1m (ORCPT ); Thu, 6 May 2021 11:27:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AFC9661949; Thu, 6 May 2021 15:26:23 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SCN-B5; Thu, 06 May 2021 17:26:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314783; bh=Q1WsziPcbnwAb2cpqQFZbO8zttZnZQq1oIpn6yJZI+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jT90qvx9MfzcfeyIFJE9XCz0ywhiU67cPZEcnlRwVlGDFG9a8ewKY9V51EKUNXG+2 BdJVo7PwOoiytmgZMVJUHIBCpohFHG6YiK91yncEC64KY3sXsGyTbQRdMC0MuTyfd8 7YM4Wlijpvt9hWWoVKXnHlgkvWSO+MkNObkN3nTek6WJ7iRcTuYgye5lRhD48l+jyL Eujpj+4df+zxARV22IYjr1Bhs40d2s7K9EM7K/vgdT0baf7JmOCutac1dnVBiYIwnW idg8hAzIYWz7eTVbHIPo4jQn8NeRfofLPrc0SI4K4D359Kqv/4YQJKPPzMz/niYS4I 2OmVXfmIx1ONA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Chen-Yu Tsai , Jernej Skrabec , Mauro Carvalho Chehab , Maxime Ripard , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v5 21/25] media: sunxi: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:25:59 +0200 Message-Id: <24d9a9a7010b155fd5cc23566b158b9cee0a66a3.1620314616.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. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/= media/platform/sunxi/sun4i-csi/sun4i_v4l2.c index 4785faddf630..54b909987caa 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c @@ -206,9 +206,9 @@ static int sun4i_csi_open(struct file *file) if (ret) return ret; =20 - ret =3D pm_runtime_get_sync(csi->dev); + ret =3D pm_runtime_resume_and_get(csi->dev); if (ret < 0) - goto err_pm_put; + goto err_unlock; =20 ret =3D v4l2_pipeline_pm_get(&csi->vdev.entity); if (ret) @@ -227,6 +227,8 @@ static int sun4i_csi_open(struct file *file) =20 err_pm_put: pm_runtime_put(csi->dev); + +err_unlock: mutex_unlock(&csi->lock); =20 return ret; --=20 2.30.2