From nobody Fri May 9 23:02:07 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=1619519281; cv=none; d=zohomail.com; s=zohoarc; b=DFsWxzcijeOdUrVvLxBI+RppKROnhIxBxls6D5QHMvAgLLKJwyvcCK5cBBQT+pRFIfopKhb78ecEskM3MTodq6uECbYXgeJfxTxu333ePzop1fYsVrMLgc0aEPkC86N0de0+iZPPvjOhXZGHPYLdtLvEbnqItthBxywsw39dVDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519281; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BuwcTYPwGYDW3c0oOtdiznPuZRdk2NS/Nrlapzzvj3A=; b=kmLhCjtUVnyXlyrqAbmbctTnqyxlTypj6DN0cKYHfWm3uxlDq8S24A4OWrCpiV93reUpfk9zdPkeSW5rpkqOflYb/DpKcdz40A50ckWyg37oiHV7FU3vlMssi/8CmQtggfOo50iweIJghxwXToQZHbe0N+TBgHgcgo/xVV8UQUY= 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 1619519281375864.1155901420476; Tue, 27 Apr 2021 03:28:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236735AbhD0K2l (ORCPT ); Tue, 27 Apr 2021 06:28:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235435AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 04262613C7; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvu-000nzG-Ro; Tue, 27 Apr 2021 12:27:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=/e5UeIJiSAmhayjaD9UYfjSrnpizVQ2PnDpNxKl2/+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KkykQfPooUdW8MA0VwbO7dz14rqXn1dm5gOHEOLQDuawdcXjO5xbUgaP+Y8iOQLhV psz+0pguVumRSPLnBiZ67uXgvvVt310sGRRbHlWP+ctgzGkgDrQk1v1zwO6Q56cRGD eeRpgu6PJFTQSZsKbxzxDREwWzL4XF2fSXMzRTKr8qd5AftNMhHOVneQh2L6aag6jH cAckoUc83ZHnFUG61QCWJR788Urg6EEMDkc1AEARvq97cF1v2AL+zraQvR8juS9yH/ ukQIin8P3zAnAsRFJnGfJ9fbLIqfBmdvZFbTGsoRfQde7qGv/mayieWt99cRuaCY+L etRezsYsMlM+A== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Hans Verkuil , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Date: Tue, 27 Apr 2021 12:25:51 +0200 Message-Id: <6d463d21f0dd55c3d84db0458c7a5c4e0d7c5bc1.1619519080.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" The venus_sys_error_handler() assumes that pm_runtime was able to resume, as it does things like: while (pm_runtime_active(core->dev_dec) || pm_runtime_active(core->dev_enc= )) msleep(10); Well, if, for whatever reason, this won't happen, the routine won't do what's expected. So, check for the returned error condition, warning if it returns an error. Fixes: af2c3834c8ca ("[media] media: venus: adding core part and helper fun= ctions") Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/qcom/venus/core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index 54bac7ec14c5..c80c27c87ccc 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -84,7 +84,11 @@ static void venus_sys_error_handler(struct work_struct *= work) container_of(work, struct venus_core, work.work); int ret =3D 0; =20 - pm_runtime_get_sync(core->dev); + ret =3D pm_runtime_get_sync(core->dev); + if (WARN_ON(ret < 0)) { + pm_runtime_put_noidle(core->dev); + return; + } =20 hfi_core_deinit(core, true); =20 @@ -106,9 +110,13 @@ static void venus_sys_error_handler(struct work_struct= *work) =20 hfi_reinit(core); =20 - pm_runtime_get_sync(core->dev); + ret =3D pm_runtime_get_sync(core->dev); + if (WARN_ON(ret < 0)) { + pm_runtime_put_noidle(core->dev); + return; + } =20 - ret |=3D venus_boot(core); + ret =3D venus_boot(core); ret |=3D hfi_core_resume(core, true); =20 enable_irq(core->irq); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519305; cv=none; d=zohomail.com; s=zohoarc; b=adyIPj+nRvP7XPh3QY9UAI/UkeWhe80VK6lbfbwhEbK1Dlnggs8h0DUCsFkKtm9FGchHLNL7+mIpTSG9kbGDD+HfmOekaDih7p0JcdupVGhXyhtx4VazXZSG85nJBISDybeAdwgc97r6mbEJqJdMgpmqWRksdI1+kGqxF8BI92w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519305; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3PC9guMqQNi7sxMrpV9+QTY1ux8dKSUuiabxwTzKtnI=; b=l7J/i9HNsqcSEmyQlLZKvA+0E/kUGLpnzUFAyVnSiWr8wxdqNxdV/K6oseW0bnQQOsvn3zjhed2nDmJ2u0JhRC99rHezRfh4ULr2wh/1TXuFMelwwv1JXtaU1XY6qOiqNjIsWBrcJu6ph5jg6bwk/cOJAX/8i/gE6rqAktjhR84= 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 1619519305437935.7664362723943; Tue, 27 Apr 2021 03:28:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238304AbhD0K3H (ORCPT ); Tue, 27 Apr 2021 06:29:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235527AbhD0K2D (ORCPT ); Tue, 27 Apr 2021 06:28:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44087613E8; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvu-000nzI-Sq; Tue, 27 Apr 2021 12:27:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=Dz4yuaAkE3G30hsowoZG+/b+CgXUAS8PpNDZLkNm+lU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kv/J9/steJcTqO8nJRpeW2trfh9u8CPl3/FlD9pDCYy3oFFq9TwdC/8UdC/b8tthy tO+6NQ5BQs2c2p14Rsug7nm4aWJZeToE8tNmu6Wle7Fk+AbX+ojI8lNpScGLESYoEV 6fkVGMnRr7mQIaFUjEcAWR75isiOnfJXZjgxK85XJAYcgzogijs4PbuaiClzVxRLPy +CR6v63b97SiRCFxaxB4N8FvWPeBU20sggTlarzsyBN5VjuK+xMfWYoCzpmtFFcx49 r5oXsNi6hA5RLOKB6RCcF1aLN6/njkl8wl97gcEwNtQCeJSjbAgEAxI/P1j8hKZVco WLoU977jpqt6w== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 02/79] media: i2c: ccs-core: return the right error code at suspend Date: Tue, 27 Apr 2021 12:25:52 +0200 Message-Id: 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" If pm_runtime resume logic fails, return the error code provided by it, instead of -EAGAIN, as, depending on what caused it to fail, it may not be something that would be recovered. Acked-by: Sakari Ailus Fixes: cbba45d43631 ("[media] smiapp: Use runtime PM") Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ccs/ccs-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-c= ore.c index 9dc3f45da3dc..b05f409014b2 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -3093,7 +3093,7 @@ static int __maybe_unused ccs_suspend(struct device *= dev) if (rval < 0) { pm_runtime_put_noidle(dev); =20 - return -EAGAIN; + return rval; } =20 if (sensor->streaming) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519398; cv=none; d=zohomail.com; s=zohoarc; b=Wa7CTSMd6Wz5+nGxWA5UJZWMsGL8NJJtXVTIrbFZx76fXjHK7PBJXXV4aZ12p7PDJ0PFF1PoX3+4xfBO9UPYpP49pEaZwLn3kxwfpzyYP/ktYb/tqJSTxPs85uX+/4XUNe0y1UW2ssg8IgADRRw5Ambf8q7co+YauZVK13vYX0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519398; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kjnLXQEdLAaAUIB7fhsYdzDvLyZbZgxSnwykg3MqESI=; b=TqXS1bkkNtRggxUMq78TwJTl9Z8I5y/8MyMWNzP46tMeKb8Yi/Pe5kiKrcaINpok1CiQHsYYAHnfHfEulOIyfYlHZ8iOpnHRWW0xvwbQsXLLp2U/x8upyptUdCyziN0AgCuC/eAaiBPPoptLW72DF5+69bAEjYKNVyfIlN3Sxxs= 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 1619519398649364.97094956874264; Tue, 27 Apr 2021 03:29:58 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238338AbhD0Kak (ORCPT ); Tue, 27 Apr 2021 06:30:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235643AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3444B613DF; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvu-000nzL-Ug; Tue, 27 Apr 2021 12:27:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=yher15YM7h61KHb/hY+EJ/RRJANP10wcnUo8G05kfG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fZLOSHxxj6XFtyWy5SPFa4XFXyrPAz+FE3eZ13Vby4rnRpAJS8mxQ2fB061SOoe2g 4QdFJF14sJZoWHxdhfGkZPIBpqHjQfPaWBy1I0yDf/bt1t62s/NnmPWG82zX7Saa8v 0TB+MR3dqrNB3MJlWOjQSR/hyQSXqtWpSLk0OjYWAyooEvcKhLfOTEYGWWFwSE83bZ 8h8l8ZPMX0mPfktJvSRzCeFtyzoUjCQJluYhD0jpE0Fz+knRYKY2W4PhcdutSjybPJ Cy52Kxc2vnSiBAWfsWC4NnPTUjOQ+W7oLci9njUD+Yu/su92K3hbfVH+eHHBnVJKpc DmPhROin1UUEw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Akinobu Mita , Hans Verkuil , Jacopo Mondi , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 03/79] media: i2c: mt9m001: don't resume at remove time Date: Tue, 27 Apr 2021 12:25:53 +0200 Message-Id: <6e37d3c545d09222882881b7717379a9042e7005.1619519080.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" Calling pm_runtime_get_sync() at driver's removal time is not right, as this will resume PM runtime. This is clearly not what it is desired there, since it calls pm_runtime_set_suspended() afterwards. So, just remove pm runtime get/put logic from the device removal logic. Fixes: 8fcfc491c6ca ("media: mt9m001: switch s_power callback to runtime PM= ") Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/mt9m001.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c index 3b0ba8ed5233..ac1b380e6c03 100644 --- a/drivers/media/i2c/mt9m001.c +++ b/drivers/media/i2c/mt9m001.c @@ -834,14 +834,11 @@ static int mt9m001_remove(struct i2c_client *client) { struct mt9m001 *mt9m001 =3D to_mt9m001(client); =20 - pm_runtime_get_sync(&client->dev); - v4l2_async_unregister_subdev(&mt9m001->subdev); media_entity_cleanup(&mt9m001->subdev.entity); =20 pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); mt9m001_power_off(&client->dev); =20 v4l2_ctrl_handler_free(&mt9m001->hdl); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519261; cv=none; d=zohomail.com; s=zohoarc; b=PI6aT0jT7MSDe3pIgcQtK5BUSCR7awuHhpb41gOprlRjTosnu0+9SpDvoYC1f0Cy9oISzpqEV4Qs5HA9Oe4nOIWnm+YfwErlFMV8TXoUXhOf/lb0eRn0odgpfs94Te+zNhjowyf02yx/HIMXN4dk1mvyj3c3cQfGtW9jRpU4uqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519261; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=guK99YQ1VKcZYfgaegiSnFwGx8FYC3jl/5vfAailnoI=; b=DkoMgeH99mGoRRjl6EqoZ9VniJoBrcReLlK/d98KzZXDVdn3KpxkQu2Goc+x1QsdhOySmcZfMFBYCrksrrl6sl314np7CfZ86WEjSpNqVTAszYYOW6Dt7JbgAqnyMiiTOv+9FljdN88k3wl5ZMA6jvj8c2awDjOEXZ8kOmyACJU= 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 1619519261048657.0268584323951; Tue, 27 Apr 2021 03:27:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237413AbhD0K2W (ORCPT ); Tue, 27 Apr 2021 06:28:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:47814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235408AbhD0K2B (ORCPT ); Tue, 27 Apr 2021 06:28:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E56C76127A; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvu-000nzP-Vp; Tue, 27 Apr 2021 12:27:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519235; bh=5AHhx16DJL5gdJqgumKoh72s5QcxkeHszhw8tqlTmq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m2GPWkxvHZOlWbkTSHetERhPlOy8zq3V4Lsk8pt7/i+GzudFxPpOpPRsRQSCogTMw 2afTeEMa5Se1g/uTW9W0DQsIOW38JynU/lWkj7ICwstHqBR0VfsgxrEZBXi4od3qGz d+S3uc4YkRcZptKDixHYbD+ldvI9TTredPrNkaiKieDvYdaYwhaSphHZ/gcJdm2wSg z3iascj+yvpxvbADuLWj+924GU+4g8v+X7/g4vRWv+Eh0VDBQLAliLgz4kF8vqojiP jub5B3hXmkl6X46GX147HbJc2mA+UwiMpqu4QOqdpVmPa7IW9fLU5JPzt6RS1JMrIU ahEsILICxWGCA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , Songjun Wu , Wenyou Yang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 04/79] media: i2c: ov7740: don't resume at remove time Date: Tue, 27 Apr 2021 12:25:54 +0200 Message-Id: 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" Calling pm_runtime_get_sync() at driver's removal time is not right, as this will resume PM runtime. This is clearly not what it is desired there, since it calls pm_runtime_set_suspended() afterwards. So, just remove pm runtime get/put logic from the device removal logic. Fixes: 39c5c4471b8d ("media: i2c: Add the ov7740 image sensor driver") Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ov7740.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index 47a9003d29d6..ed6904b2e8f5 100644 --- a/drivers/media/i2c/ov7740.c +++ b/drivers/media/i2c/ov7740.c @@ -1165,10 +1165,8 @@ static int ov7740_remove(struct i2c_client *client) v4l2_async_unregister_subdev(sd); ov7740_free_controls(ov7740); =20 - pm_runtime_get_sync(&client->dev); pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); =20 ov7740_set_power(ov7740, 0); return 0; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519321; cv=none; d=zohomail.com; s=zohoarc; b=mV53/aRyPl8Z+/txt8KdXgInvZvU+aMitBOlWF+5iL2Xa2P5KVEUMSvzhE8ctscsvztGUNrthuc0H54wL+IlB4LULDyL12mRdgdz1Kbm/6kEUYpre7eV4++AQDykwyIW/14ePMq2Q0NYJnoF2Z8jlJ+djXmk66uCyHVgZj3IXns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519321; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y4HbtEW1zV5dDZwbpaA+MDL4IcAxQ1flmWTbEwBwsyg=; b=YRwu3V6/aH34C7/Q4g81C+7TJK25X3uE4yQcpQ5QfoFMDiUEDmAjWI+NKU8Dez1ZPK5Jk4RXEyt3sk4ABFDM2ucZecvVtnuo43F6W0R9kcWnJcioX/dpchepMWNPXt6dCuYXdbvihi43gdh0ZgE2KpqO5llb/OnGtPe3eVCCDhQ= 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 1619519321264384.1495383253583; Tue, 27 Apr 2021 03:28:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238469AbhD0K3U (ORCPT ); Tue, 27 Apr 2021 06:29:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:48192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235545AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3874E613E4; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzS-1M; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=v0N3nXsqMajMGBVdnEBF4DR9l7FpjhgT+LyWaPFGjVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TEf7qhVehujQVV6Albr0nyFqVDACoM1pOFSNDknpUYSeLQo1k5o5iS4ZlIsro3/vb W9TlBQ8H0Eyv+qGhzZjeBPOFR9neTQrJ/cpFVgVdt+Xg8UEwVP8buY5RxkXAz+sSvC xX4kGpzAlFRoAHPmor+FmDiBI25kezRKSDxIA7ZD2zip2r+qo6JqJ82QISjANJin+p K0lND4+TZUI+yDlJhzC7Ey0o09YNEQdVhWs7i5G82W4nqm5RwzsUBby9xjUHKLUHtG WOJ9Ndlb1DoAGxvOJxpJYPfWKF3nhvAMxGD/teKpUuMQKY0DzZKlvT3GZsFszAiQOo vb7ZhXR4js0rQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Akinobu Mita , Hans Verkuil , Matt Ranostay , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 05/79] media: i2c: video-i2c: don't resume at remove time Date: Tue, 27 Apr 2021 12:25:55 +0200 Message-Id: <2b0d9e2e11bc883f1d630d43a5a464af9279b267.1619519080.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" Calling pm_runtime_get_sync() at driver's removal time is not right, as this will resume PM runtime. This is clearly not what it is desired there, since it calls pm_runtime_set_suspended() afterwards. So, just remove pm runtime get/put logic from the device removal logic. Fixes: 69d2a734c5dc ("media: video-i2c: support runtime PM") Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/video-i2c.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 0465832a4090..c9a774f4c8d2 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -893,10 +893,8 @@ static int video_i2c_remove(struct i2c_client *client) { struct video_i2c_data *data =3D i2c_get_clientdata(client); =20 - pm_runtime_get_sync(&client->dev); pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); =20 if (data->chip->set_power) data->chip->set_power(data, false); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519379; cv=none; d=zohomail.com; s=zohoarc; b=Yo4lJ/tMPPHRykCI8UQZmfH+yh8WS03N+ewuYISrvWR+WnEYLSW5ZqMSphiU1sp3fuz6q7gxVuuHOg/qBwJyWsRe+gSnFfS9SG11bARa5EiH89mZPHzFLAfFeyJ+UrAPQnoINl7Vlkdet/y8H2h225ESopuvysyuCw81iJjaYto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519379; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=79dWgd//jb1ogaDGIhMBJ4K4q3CzJDbVFoiHLI9HXdc=; b=D2ErQ2RPzJb9aT3L0wngy8Iux7tyt4nJN7Lf9NjtsTIw7WkqlszNZUjTOohFuN4V0piNl4lCfFfCaSb24PQSj6dIk17pKf2s/2IljtEc+vbzvYHpaDcxkGvtaVqe2gCW+joMMYqeM9OqIrV46V0WdvmUheIbvVuzeZxZMatPCcU= 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 16195193790825.389680079285995; Tue, 27 Apr 2021 03:29:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238007AbhD0KaU (ORCPT ); Tue, 27 Apr 2021 06:30:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:48150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26551613DC; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzV-3G; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=f7qp1inQpFhzLXGKfN6L+okBW8R7Adck1d72J+XCiZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nk63xs/U5+H50yDNDVtINBdbnbVjdI0k1ER0vB6Hueg8zEeM20wKRYFpCgZB6IzI6 4DgCSqWfQuKbb+nAiQOEuJi+2A4CAVyRS+61A0W7pDU4zZmZaMOZg2ld/q0xsLEd5E A6PnPJqgPN/61bhxJgGkIJ/mmX4qVJNpH0hSlCDv2hvWNvtwEqBz6IDuhcyYs+h8/p mkwJQ+WEp427ZpNOk1w6SEqZtGBTTkf82tdvOKiU4Dtrg+5m24F+LgZIGUdVSqzfrt 5HLBeRQfWE3CYhPOGIep8lw7SSmxc6CTu56a0PI0XPkjlG37DtPhmlQy2QWc+FKR7V oH1idtQg/J8dQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Hans Verkuil , Krzysztof Kozlowski , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 06/79] media: exynos-gsc: don't resume at remove time Date: Tue, 27 Apr 2021 12:25:56 +0200 Message-Id: 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" Calling pm_runtime_get_sync() at driver's removal time is not needed, as this will resume PM runtime. Also, the PM runtime code at pm_runtime_disable() already calls it, if it detects the need. So, simplify the code by getting rid of that. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/exynos-gsc/gsc-core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/p= latform/exynos-gsc/gsc-core.c index 9f41c2e7097a..70e86cdc1012 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1210,8 +1210,6 @@ static int gsc_remove(struct platform_device *pdev) struct gsc_dev *gsc =3D platform_get_drvdata(pdev); int i; =20 - pm_runtime_get_sync(&pdev->dev); - gsc_unregister_m2m_device(gsc); v4l2_device_unregister(&gsc->v4l2_dev); =20 @@ -1219,7 +1217,6 @@ static int gsc_remove(struct platform_device *pdev) for (i =3D 0; i < gsc->num_clocks; i++) clk_disable_unprepare(gsc->clock[i]); =20 - pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); =20 dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519354; cv=none; d=zohomail.com; s=zohoarc; b=a3CwfaE2KCC0uMJqIBcYrPvO9cYjneOvyEX5+Le0zxe1kM+NvNefod/y1UsciEDSW45AQv9dAFAPjJRJsNC++S29F5YRRJkVTdqxm+J+Wj8WlqLW4a9MfoTAAOc2oPgKuJ3xRoCrLnjPMedY1fmX6W2zx71FuV+6Cixu7Q3OhFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519354; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jEITpg5PVFjzGLluAxPMynipaClS1/3Jo4C972zlT7Y=; b=ZJP+j1GuxIPPqGJ4XDc34rDdbQTc9BbaHZOX5skdCk96U2WxYFmY+hwZlQZ9B8jo/Hx1AAQ3gMmrrx77LY/onYfkWb7pFOCx0iNa9OF18hT6FMNWP6cZyLD+/ynuDFSEhyTMcyTkCCA8dttGVnOtrYXk/7SRUohkBGMEndYpFlc= 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 1619519354462492.2095019679665; Tue, 27 Apr 2021 03:29:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238367AbhD0K3x (ORCPT ); Tue, 27 Apr 2021 06:29:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235585AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4426B613EA; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzY-59; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=7cvQL/2CEUShgMHfIXo5pZaMj/4OUeemdQZifBElsOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WycUNygp6P/3tN8hyVAUOBK7IBkSSnazg3XY7J+/XtQ2pzXZ60SD6NEIGS2cBfpVo ld5TgAiy6agzqm3f+DqunlH6qabduzlureGledcla8B5lAUxWq7JZpZ6Gvr+8v0LnS MpTUvggTfBaELmE4x11sqCeP9eKgSvKb31Ne1jYhY8iJ0NEVgDOpv9gCpvnz9I2bN4 eJZiWnjmIoZA3mJLLBgEwMp4oS+5G4J/Xv3dluTu0wt7RINiuCtUqMMDc3XDYkH3Wz FBnIdTZ9AXYeABUWoxirilvBZjb0MJGeRmvJxPkEZHZLupPNj9MCgZD3fSR5OILWpJ L3jCyPNdr5zjg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Alexandre Belloni , Eugen Hristev , Ludovic Desroches , Mauro Carvalho Chehab , Nicolas Ferre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 07/79] media: atmel: properly get pm_runtime Date: Tue, 27 Apr 2021 12:25:57 +0200 Message-Id: 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" There are several issues in the way the atmel driver handles pm_runtime_get_sync(): - it doesn't check return codes; - it doesn't properly decrement the usage_count on all places; - it starts streaming even if pm_runtime_get_sync() fails. - while it tries to get pm_runtime at the clock enable logic, it doesn't check if the operation was suceeded. Replace all occurrences of it to use the new kAPI: pm_runtime_resume_and_get(), which ensures that, if the return code is not negative, the usage_count was incremented. With that, add additional checks when this is called, in order to ensure that errors will be properly addressed. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/atmel/atmel-isc-base.c | 27 ++++++++++++++----- drivers/media/platform/atmel/atmel-isi.c | 19 ++++++++++--- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/= platform/atmel/atmel-isc-base.c index fe3ec8d0eaee..02543fe42e9d 100644 --- a/drivers/media/platform/atmel/atmel-isc-base.c +++ b/drivers/media/platform/atmel/atmel-isc-base.c @@ -294,9 +294,13 @@ static int isc_wait_clk_stable(struct clk_hw *hw) static int isc_clk_prepare(struct clk_hw *hw) { struct isc_clk *isc_clk =3D to_isc_clk(hw); + int ret; =20 - if (isc_clk->id =3D=3D ISC_ISPCK) - pm_runtime_get_sync(isc_clk->dev); + if (isc_clk->id =3D=3D ISC_ISPCK) { + ret =3D pm_runtime_resume_and_get(isc_clk->dev); + if (ret < 0) + return 0; + } =20 return isc_wait_clk_stable(hw); } @@ -353,9 +357,13 @@ static int isc_clk_is_enabled(struct clk_hw *hw) { struct isc_clk *isc_clk =3D to_isc_clk(hw); u32 status; + int ret; =20 - if (isc_clk->id =3D=3D ISC_ISPCK) - pm_runtime_get_sync(isc_clk->dev); + if (isc_clk->id =3D=3D ISC_ISPCK) { + ret =3D pm_runtime_resume_and_get(isc_clk->dev); + if (ret < 0) + return 0; + } =20 regmap_read(isc_clk->regmap, ISC_CLKSR, &status); =20 @@ -807,7 +815,9 @@ static int isc_start_streaming(struct vb2_queue *vq, un= signed int count) goto err_start_stream; } =20 - pm_runtime_get_sync(isc->dev); + ret =3D pm_runtime_resume_and_get(isc->dev); + if (ret < 0) + goto err_pm_get; =20 ret =3D isc_configure(isc); if (unlikely(ret)) @@ -838,7 +848,7 @@ static int isc_start_streaming(struct vb2_queue *vq, un= signed int count) =20 err_configure: pm_runtime_put_sync(isc->dev); - +err_pm_get: v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0); =20 err_start_stream: @@ -1809,6 +1819,7 @@ static void isc_awb_work(struct work_struct *w) u32 baysel; unsigned long flags; u32 min, max; + int ret; =20 /* streaming is not active anymore */ if (isc->stop) @@ -1831,7 +1842,9 @@ static void isc_awb_work(struct work_struct *w) ctrls->hist_id =3D hist_id; baysel =3D isc->config.sd_format->cfa_baycfg << ISC_HIS_CFG_BAYSEL_SHIFT; =20 - pm_runtime_get_sync(isc->dev); + ret =3D pm_runtime_resume_and_get(isc->dev); + if (ret < 0) + return; =20 /* * only update if we have all the required histograms and controls diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platf= orm/atmel/atmel-isi.c index 0514be6153df..6a433926726d 100644 --- a/drivers/media/platform/atmel/atmel-isi.c +++ b/drivers/media/platform/atmel/atmel-isi.c @@ -422,7 +422,9 @@ static int start_streaming(struct vb2_queue *vq, unsign= ed int count) struct frame_buffer *buf, *node; int ret; =20 - pm_runtime_get_sync(isi->dev); + ret =3D pm_runtime_resume_and_get(isi->dev); + if (ret < 0) + return ret; =20 /* Enable stream on the sub device */ ret =3D v4l2_subdev_call(isi->entity.subdev, video, s_stream, 1); @@ -782,9 +784,10 @@ static int isi_enum_frameintervals(struct file *file, = void *fh, return 0; } =20 -static void isi_camera_set_bus_param(struct atmel_isi *isi) +static int isi_camera_set_bus_param(struct atmel_isi *isi) { u32 cfg1 =3D 0; + int ret; =20 /* set bus param for ISI */ if (isi->pdata.hsync_act_low) @@ -801,12 +804,16 @@ static void isi_camera_set_bus_param(struct atmel_isi= *isi) cfg1 |=3D ISI_CFG1_THMASK_BEATS_16; =20 /* Enable PM and peripheral clock before operate isi registers */ - pm_runtime_get_sync(isi->dev); + ret =3D pm_runtime_resume_and_get(isi->dev); + if (ret < 0) + return ret; =20 isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS); isi_writel(isi, ISI_CFG1, cfg1); =20 pm_runtime_put(isi->dev); + + return 0; } =20 /* -----------------------------------------------------------------------= */ @@ -1085,7 +1092,11 @@ static int isi_graph_notify_complete(struct v4l2_asy= nc_notifier *notifier) dev_err(isi->dev, "No supported mediabus format found\n"); return ret; } - isi_camera_set_bus_param(isi); + ret =3D isi_camera_set_bus_param(isi); + if (ret) { + dev_err(isi->dev, "Can't wake up device\n"); + return ret; + } =20 ret =3D isi_set_default_fmt(isi); if (ret) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519303; cv=none; d=zohomail.com; s=zohoarc; b=bZoHTZi2SUj3Zg4eUEIPEtUyTSdN7XyLEmiz6SpBNlliA+LYol7o1R1Bl+Zv7dHYjrjfPrp0w3OgHR8xeL/ed5G+aXINFXsVhrEyciUG+Sum4xk7GaROVSz0rSBxG/9mz1duP1RhUpqQUocBbwjo4TSseCu+39eTuzCBtVhFXeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519303; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QSKtpUAxvTy/bkqw/JfwZ35LoMEOtg/nFZIWGnE34yQ=; b=WIEYgifbK5R/uG8PykQAbElP9Cs1kdtt30ubkgGh1JV/cWJKdghjdsbZkaWn4Yx05gseEDF8m8hCBi1wjc6nkyBtQS6O1UlqiRVOBv+GvnXXcFW1XCNxwYw5kHGzStjfHK36nJrILh+bfDsr5yGTCXZVlzDvdEiixp44aH1Ikpc= 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 1619519303531784.7521637595781; Tue, 27 Apr 2021 03:28:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238284AbhD0K3E (ORCPT ); Tue, 27 Apr 2021 06:29:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:48172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235528AbhD0K2D (ORCPT ); Tue, 27 Apr 2021 06:28:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 36D98613E2; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzb-7l; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=HuTLNsPcfIqbw1UtY6p4jIBErIihq3Y8I/97JFK7QN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S0AznLAsZJV3COnj3iwHtvPXkVBkNsOlibh1fhyLtqkA7FFj1Rn1+SNjjUp1Cqu6r 15LG/DAYMBE80JwlE2IO0SlHVLFf3R20DV0TVKhDn8XrkUu6cf1mmEh2X8Os71VtXg TZ1V71qoBHRGCSsSNKC5rkaBuo0XpwfzOvGXl4E6zOHgDoABOEolcIqFoEQwrWK0IY hN/lCjSgLG6z06c3gwkZkol9JZgSsHKlJuhZwVWVYGyjXjHnbTz875azYwgC+nPMnF XqbtOdAWUafdCNpPF6oqTHMTEebzipvyKBYvrI+YY4W9gpEfi6nYYy6qEcAnAyZ/x6 MzB/RgZl0zBhA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Gustavo A. R. Silva" , Allen Pais , Chuhong Yuan , Ezequiel Garcia , Hans Verkuil , Helen Koike , Lubomir Rintel , Mauro Carvalho Chehab , Sakari Ailus , Vaibhav Gupta , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 08/79] media: marvel-ccic: fix some issues when getting pm_runtime Date: Tue, 27 Apr 2021 12:25:58 +0200 Message-Id: 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" Calling pm_runtime_get_sync() is bad, since even when it returns an error, pm_runtime_put*() should be called. So, use instead pm_runtime_resume_and_get(). While here, ensure that the error condition will be checked during clock enable an media open() calls. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/marvell-ccic/mcam-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/medi= a/platform/marvell-ccic/mcam-core.c index 141bf5d97a04..ea87110d9073 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -918,6 +918,7 @@ static int mclk_enable(struct clk_hw *hw) struct mcam_camera *cam =3D container_of(hw, struct mcam_camera, mclk_hw); int mclk_src; int mclk_div; + int ret; =20 /* * Clock the sensor appropriately. Controller clock should @@ -931,7 +932,9 @@ static int mclk_enable(struct clk_hw *hw) mclk_div =3D 2; } =20 - pm_runtime_get_sync(cam->dev); + ret =3D pm_runtime_resume_and_get(cam->dev); + if (ret < 0) + return ret; clk_enable(cam->clk[0]); mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div); mcam_ctlr_power_up(cam); @@ -1611,7 +1614,9 @@ static int mcam_v4l_open(struct file *filp) ret =3D sensor_call(cam, core, s_power, 1); if (ret) goto out; - pm_runtime_get_sync(cam->dev); + ret =3D pm_runtime_resume_and_get(cam->dev); + if (ret < 0) + goto out; __mcam_cam_reset(cam); mcam_set_config_needed(cam, 1); } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519270; cv=none; d=zohomail.com; s=zohoarc; b=gmOnVAOU7twmuGHHeUHMLrVopEJFzlach13MuFGfdvlRjPRkIE+VeQjSM6ET60KWgDW52l1Jt5qcWoFCan9VoIRz4mhhxBqqRzhz/aPr0Wrs8E6OalwiImJ4o7TAcwtPbok2yCaywWcKsSfwgsWWKCcd3oak0LFpXcsRfCDRWb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519270; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CkzDiRgPy8iejVwPrfGJj8JwW/3IpRiOAho8UUQxXuo=; b=YieAoAfPgzv6txu//6xlpLBDo4tTtMdaHY8a7LT5IL5JqyZJsahjUfepnCITB8XXX42wweYC+LLIzc9V7VznqgpZbOXpG86XYaPB1BtcJyDeATJndoT7jaO9CD8TbyKben+cs+s4goGHJQWla9YjfNF+PtdJHdh/bL2MrDrUgmY= 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 1619519270131903.9884129613729; Tue, 27 Apr 2021 03:27:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237958AbhD0K2b (ORCPT ); Tue, 27 Apr 2021 06:28:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:48148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235488AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0DFB3613D1; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nze-9a; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=XfZSeMotNFyXbfT608pw1ECU5JJkssXPopFyWbltzaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rpva4pFFX1xfT9Qib5p16t22Qy4kyDXU+xli54LmAHrWSU6MjllDO6dkdX6bUVwZ3 XoLxwUwncX8bHFaT1feMahtZ+mAAcCgw9eMbJTJMhv6vDhZT+n1hUnlfhyZNW6QpuX uuxSjuz+fpGbgDKpIH37kIytUd/fGeWmhKhmQg5QFKDuY5Cmh1qS4tZGW0VvvUXxth oriZ4yCj0cUbddMeU6OXQk9fijw0kueq02+0pTVgm7RzpgEpdKWiAgbCeANvwzjfBY MamIJdt/Tc8Zb3cUxVSGkFcdxolaDIRv0mmt4Bm7h8EAvOgY/7VZPekBppXj6EqtwA tJ+uYfo7qWX6Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrew-CT Chen , Houlong Wei , Matthias Brugger , Mauro Carvalho Chehab , Minghsiu Tsai , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v3 09/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:25:59 +0200 Message-Id: <6f2e4b112f845f9be1de07cb8d73ff3173dec01a.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. While here, fix the return contition of mtk_mdp_m2m_start_streaming(), as it doesn't make any sense to return 0 if the PM runtime failed to resume. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/p= latform/mtk-mdp/mtk_mdp_m2m.c index ace4528cdc5e..f14779e7596e 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c @@ -391,12 +391,12 @@ static int mtk_mdp_m2m_start_streaming(struct vb2_que= ue *q, unsigned int count) struct mtk_mdp_ctx *ctx =3D q->drv_priv; int ret; =20 - ret =3D pm_runtime_get_sync(&ctx->mdp_dev->pdev->dev); + ret =3D pm_runtime_resume_and_get(&ctx->mdp_dev->pdev->dev); if (ret < 0) - mtk_mdp_dbg(1, "[%d] pm_runtime_get_sync failed:%d", + mtk_mdp_dbg(1, "[%d] pm_runtime_resume_and_get failed:%d", ctx->id, ret); =20 - return 0; + return ret; } =20 static void *mtk_mdp_m2m_buf_remove(struct mtk_mdp_ctx *ctx, --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519321; cv=none; d=zohomail.com; s=zohoarc; b=EGZ4YnsKge+nEgptjUtPYa8yd2gZ/SlhWI9xEYlXLE78LLmvVTdu1ji/zAMqzdTBU04dW6NNhJf24hTVua9sXwYhpXlraxxF/4PA0wRHui8qZtCuX4wacfgjHdNbtyXjj5bmK8nDNt3b1UkIgKu9L+ouftme3jIbTBNALxitgA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519321; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KgD/UET03mpXhrsM3R2k8AhQEpKAFT3bwKYvDYrD0nc=; b=Yfe3Pq3gVHsLSLo6OlJ2ojlUkjhAMcw2HGge5yN3X1BnjwEjiHiRp/PknNYHFxHPgo0BjTyHYRNx5gP5707XdRw6S0v73/jACnmst8R9wYi4Yb2DVUn07RLfEwScM3j0cq6Hdw6tPgLjCruUZCvlJLUXA/TSH2rKY4tdQBo1z6Q= 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 1619519321000858.7362749973888; Tue, 27 Apr 2021 03:28:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238431AbhD0K3S (ORCPT ); Tue, 27 Apr 2021 06:29:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235540AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 27746613DD; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzh-BP; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=vSVgVx9oCI4BykR40BTa4+7tin+dlK2U4+Benc8+UkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pLaCD4ofqL5rXZRv9KJFm6qqqJsqVPXNi3IXzSjhGRLDdW9MBRZ5iVhqvRmUsYonP pp/8ZGF5xrtnUbbOYSWlRQINpYubh4VTxzD3w4u0Iju9BCtsQan3Iqzo20e/4fiBj4 wxkWEB0iHbYNMPZGR53hBhM2d5U/JxEdM8oYQDBWebB1B9h5izn7/ETooQ6QCwhxkp G/c2H4Z7DdKUO7rT0RA2MTGfoywUxW7tdohSAPKwaQz3RKVmyG5tmdv4nX5r5k0ndt BUwSrcXKUpluwk7ocgeR1Fbk6KUhTz2o1P3azH9yfzFLwvWDkHsAL0dO/nTHDoVTb7 UU8L4DE3DAZDg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Kieran Bingham , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 10/79] media: rcar_fdp1: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:00 +0200 Message-Id: <9a79a72f93981227f21cd8fa8fc8c2d26eeb4d7b.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Also, right now, the driver is ignoring any troubles when trying to do PM resume. So, add the proper error handling for the code. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/rcar_fdp1.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rc= ar_fdp1.c index 01c1fbb97bf6..c32d237af618 100644 --- a/drivers/media/platform/rcar_fdp1.c +++ b/drivers/media/platform/rcar_fdp1.c @@ -2140,7 +2140,13 @@ static int fdp1_open(struct file *file) } =20 /* Perform any power management required */ - pm_runtime_get_sync(fdp1->dev); + ret =3D pm_runtime_resume_and_get(fdp1->dev); + if (ret < 0) { + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); + v4l2_ctrl_handler_free(&ctx->hdl); + kfree(ctx); + goto done; + } =20 v4l2_fh_add(&ctx->fh); =20 @@ -2351,7 +2357,9 @@ static int fdp1_probe(struct platform_device *pdev) =20 /* Power up the cells to read HW */ pm_runtime_enable(&pdev->dev); - pm_runtime_get_sync(fdp1->dev); + ret =3D pm_runtime_resume_and_get(fdp1->dev); + if (ret < 0) + return ret; =20 hw_version =3D fdp1_read(fdp1, FD1_IP_INTDATA); switch (hw_version) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519320; cv=none; d=zohomail.com; s=zohoarc; b=KRA8sBndIPnqyjsGewLl/kmndpn1OJq3KqW79oa19Sg+ffOTie5lPlIXODYcfLSKkN8SWL2PL0+l8O4pbtstWbJrhfOLZc/3S+AE5bVbTk35v36stQ9OhRM9pQpRyCKVunIPbjYnTpXb5Pgpg2uXKXojJVUROAUoOaltWe3nLBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519320; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k/JT4xNc8q+xgw65KVZhdHtvOyVt1/eDaJCw7AtYUJ4=; b=mdGsp9O6TwVtigfojcMEeA8aqEim3bJCbay1BGoPgrcG8SrwbmHUvF/uM6s6pFckPtFeooc591zNE4RVdxkOA+ZfGC3Zu4FdM0FWs53IO361nH9j2GvECDxSmWGcQx0RbkIHooH/a0GnGjkxJx905aOy7PagrdNpiLOG0Jd40v8= 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 161951932032369.09719144131645; Tue, 27 Apr 2021 03:28:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238379AbhD0K3N (ORCPT ); Tue, 27 Apr 2021 06:29:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:48148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235547AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 487C1613EF; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzk-DU; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=uJQR0czm+DeAW2PWQeBvZ4Rvzd+S5i8+90myFebensI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jVnwnb5PZqgl+8wS3a81LGuG33LLQQG5gU+krefP1JpsPHclKD/qXIjYqGWDhXj55 33ZRf6pF3l25eqc23Gs5pQdb0PDVHjURu+5v6pv2wTDR2k3uuNt6odSP9+6BpqCcYd d/3Degiy2aE7zY3jDL0nmMN6wAYcVoY24xda0SeYx6pUfEfpJCXrXpLKzBsi3uUBHL pVypllmFBWs0zwfTFOHdkx9Da4ikdpe+ma+x5heSsVnA874VjASk5gH6YgAulNQ3WA BufVzIeVNbWeGsNO45wpB2uYN9PNZRI/HwQ2DqN3hKdQKXTVe0cPNGxufc13iTQ33+ pdjzD89XjIGGw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Heiko Stuebner , Jacob Chen , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v3 11/79] media: rga-buf: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:01 +0200 Message-Id: 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/rockchip/rga/rga-buf.c | 3 +-- drivers/media/platform/rockchip/rga/rga.c | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/= platform/rockchip/rga/rga-buf.c index bf9a75b75083..81508ed5abf3 100644 --- a/drivers/media/platform/rockchip/rga/rga-buf.c +++ b/drivers/media/platform/rockchip/rga/rga-buf.c @@ -79,9 +79,8 @@ static int rga_buf_start_streaming(struct vb2_queue *q, u= nsigned int count) struct rockchip_rga *rga =3D ctx->rga; int ret; =20 - ret =3D pm_runtime_get_sync(rga->dev); + ret =3D pm_runtime_resume_and_get(rga->dev); if (ret < 0) { - pm_runtime_put_noidle(rga->dev); rga_buf_return_buffers(q, VB2_BUF_STATE_QUEUED); return ret; } diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/plat= form/rockchip/rga/rga.c index 9d122429706e..bf3fd71ec3af 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -866,7 +866,9 @@ static int rga_probe(struct platform_device *pdev) goto unreg_video_dev; } =20 - pm_runtime_get_sync(rga->dev); + ret =3D pm_runtime_resume_and_get(rga->dev); + if (ret < 0) + goto unreg_video_dev; =20 rga->version.major =3D (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF; rga->version.minor =3D (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519402; cv=none; d=zohomail.com; s=zohoarc; b=BGsWq66CGRYut9AQWy8RJV2AkS8hT59Pb3tO/jVLfQ9IOLd93RzeSx4m2lTVCrk9hH/vGxPYXSFA1mWzWneF5ayw/qDVRD7ev4J4kehJysT3WMGXlkZx3M0UNmWYD7ubeKWPWdopQiOgqmTS9DTLg+UgKZZdbHoYpN1pq+KiY9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519402; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tWU6oxk3O0XbPxS5UZj38gwI17sYWRfTMEjtpdj4j80=; b=f9urWWf0S5arEkoQJRr5CKjsaPALOHPp73oLvRy6FDjxcMzFPBYW2Fwy7CynIBMmVdkmIpM/JX/nSTlY4NI7YqXpnJ1fWEX7ah3ueALhEjNr37KNxMinDO5/nbMLLiViVUWXoU28tL8dV7GQ/9fZ3gomPIMCF/HDej9VRbY1VNM= 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 1619519402919534.7144364789656; Tue, 27 Apr 2021 03:30:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238515AbhD0Kao (ORCPT ); Tue, 27 Apr 2021 06:30:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:48142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235635AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 428DD613E7; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzn-FQ; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=WqKoYQevkaStNcKaOzNIvfyWSTMDPdaJk89Ynu0GOzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RyBpl6AKaQKI6Mfu73bAvucGOohlNoKilp4m+KOexK1Etf0BZPy0FFCRJ04WDR/HZ VOUn9LsCW3gVbQfuNQe18ZI+Gg7DD/zmNu+WeXMVdZFNQqbE6HQrvTAYIuDssqDJJX K80H2JVkEHyzM5jFBdQQkAWTsEjDAZR57bfR1pnCzp2n0/OV/xh3/RmHroTzLEP8tt l8+lviYnkQ0eGg1WiX5tF9inHLdV6tLBp3sR12fy6AR/677yzDG+pIr3T30TbhWGB2 JxXejjwtLR8n7xyaiTg1uisMlhxGBmXQzj181tYSjwGOCmQjdSYKGLkyIznHa3gU/r r5JX4VExbKuvA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Jacopo Mondi , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 12/79] media: renesas-ceu: Properly check for PM errors Date: Tue, 27 Apr 2021 12:26:02 +0200 Message-Id: <54ff89c9e585c21fef85c4a47b6fa1f1b1ba3677.1619519080.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" Right now, the driver just assumes that PM runtime resume worked, but it may fail. Well, the pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. So, using it is tricky. Let's replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") and return an error if something bad happens. This should ensure that the PM runtime usage_count will be properly decremented if an error happens at open time. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/renesas-ceu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/= renesas-ceu.c index cd137101d41e..17f01b6e3fe0 100644 --- a/drivers/media/platform/renesas-ceu.c +++ b/drivers/media/platform/renesas-ceu.c @@ -1099,10 +1099,10 @@ static int ceu_open(struct file *file) =20 mutex_lock(&ceudev->mlock); /* Causes soft-reset and sensor power on on first open */ - pm_runtime_get_sync(ceudev->dev); + ret =3D pm_runtime_resume_and_get(ceudev->dev); mutex_unlock(&ceudev->mlock); =20 - return 0; + return ret; } =20 static int ceu_release(struct file *file) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519376; cv=none; d=zohomail.com; s=zohoarc; b=bAjOwSCbHSFNzyqtGQYjNgFpnqTWBTchN4bb4HNE7oi68wbqkgC3mO7jZ/Pj8wE9E3QrU3DB3GAx0Y8fi/tg7QGxfw/hkL94z+AnFR5WepdYI6T13SFVnN0+c45e97idm2UGd4YNDOAnFl9iMEwzvApLbPv53pJAyVZyF0uhlG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519376; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JZCcDtEMjFU3G6MX5kOHe8ojHFY31zzJmAJGlChNtgg=; b=lTfcF8g0XO1xJ56zmEjX6JepZOgKqxVuNDsNhnnA/kXFFcbsIMvDl4KEOmHuawCschyHSRmyiGu7Gbo2VmaCtC5XKCmpf0DDhHQfQ/CIyPEHFNMMm6hwvGQlVlwjyZDHWyjgdOk4Fnv9wlRdsubcjFlWLt+fxzj/yTBUwyU8wYg= 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 1619519376551488.1310082008042; Tue, 27 Apr 2021 03:29:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235653AbhD0KaS (ORCPT ); Tue, 27 Apr 2021 06:30:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:48260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235591AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 43D9B613DE; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzq-HS; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=ozAIBQhBgl4hYvo20eM4TXq01azS0FPBmDKGIed3VZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NPFqTqlF0IRcLPyr2Ilr5D2UJxj3wLjzDYr76u1PZYkzaOq5/IF4mOisDPuuR105T qLhqhekZIwQnU5zjSXmHr7idtL8IvsVr+ijI1LxbiQH5ukUIWK+UP9GEPch/UUSclP jBjyGfHKGth/taeozqLBjp7KPjOHxoz1vibewc3KjvA3QN1tlQe6wWxNaZvPkXeavA Xw0IDm/iwg/UBf8waunwhotlBGLNIyZvuY/14AExk76TZutDnK6ocfEqDp0BKheeNF Get/pHMAku6R/4qisRFU3V3MCKAflo2KO2c7d/mUxh/e+utQ6C5Iodl2Vk/BA3zsEj +v/n1J1SIWHCQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Hans Verkuil , Marek Szyprowski , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 13/79] media: s5p: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:03 +0200 Message-Id: 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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. While here, check if the PM runtime error was caught at s5p_cec_adap_enable(). Signed-off-by: Mauro Carvalho Chehab --- drivers/media/cec/platform/s5p/s5p_cec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/cec/platform/s5p/s5p_cec.c b/drivers/media/cec/p= latform/s5p/s5p_cec.c index 2a3e7ffefe0a..2250c1cbc64e 100644 --- a/drivers/media/cec/platform/s5p/s5p_cec.c +++ b/drivers/media/cec/platform/s5p/s5p_cec.c @@ -35,10 +35,13 @@ MODULE_PARM_DESC(debug, "debug level (0-2)"); =20 static int s5p_cec_adap_enable(struct cec_adapter *adap, bool enable) { + int ret; struct s5p_cec_dev *cec =3D cec_get_drvdata(adap); =20 if (enable) { - pm_runtime_get_sync(cec->dev); + ret =3D pm_runtime_resume_and_get(cec->dev); + if (ret < 0) + return ret; =20 s5p_cec_reset(cec); =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519694; cv=none; d=zohomail.com; s=zohoarc; b=l5q++eKIIL2iY1pKp0Mqw5zgtYWXymJMrXvr0hFErouPosWXUFFGzSkb6AMysXoGIuax3GEo3mdK+X12P5L0cjs1vK4qXrYnVeDmBsEH3AEc2JiUZQeMWyTt6FopkqkwngXk6UzjagHvMOj360pojB66Q3+p4dzG2g3Uppxc1wM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519694; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L9GUzAChTMJUtDH0+OWuOob2OsTvBtiUXD5nsFmfEUo=; b=TD1rL5xUjEMSn9d5vPkluNw34SzCBfVNXBfM4qgP8pd9/E2wS1qTHWj+tFjUItl5LxAaYBXbEitmOBVVQ2Oz5bz86nn6Cly9dJ82HZ8qXCSyE9eB5n9+GVOeV1HMHJcPGledQru8OCG+Y20NJtXNm+AfKYLoEuWOTFnGtvRiA5Y= 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 1619519694964968.0174043822867; Tue, 27 Apr 2021 03:34:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238828AbhD0KeQ (ORCPT ); Tue, 27 Apr 2021 06:34:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238099AbhD0K2m (ORCPT ); Tue, 27 Apr 2021 06:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0383361481; Tue, 27 Apr 2021 10:27:17 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzt-JM; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=v3oOn6uPHJX4lDQc2LG+Rn/44BbALYGNkVgzHn1PdbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEckz/fuxi4Yvs858mBbDa/aqLRqDtn9bj58CCmGAwK+QlqI37NtGR/Y+J/OXjsBP PNc65TsKhuzdT/yReKJQSOyQBpdMzZ3HgVk459MlonuhUKxN06+tIgvNT9Jaz3QfE/ trGOaUWCkBkAAj8suBC9dpgUQjA3PnqAsf9lWiAqueppxgWDLid18DETKQP8NS5sUJ vX1DuVJFZrSRH+Pnwv+Ne0PkrDqGtAXPQHQRPQtlzPUbAiiFx4ilBStNbtSSQrgyhW /Sio56g1+Bv5UGnVUQL38bXFwNA+Ws2vC8338NGikS7/6p8sHMdeRjAOuJjko4MMG1 pbDKV4IBvXrOg== 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 v3 14/79] media: am437x: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:04 +0200 Message-Id: <657bba55e6afbb321b0f0c612d0b8f900e365594.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. While here, ensure that the driver will check if PM runtime resumed at vpfe_initialize_device(). Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/am437x/am437x-vpfe.c | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/pl= atform/am437x/am437x-vpfe.c index 6cdc77dda0e4..bced526f30f2 100644 --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c @@ -1021,7 +1021,9 @@ static int vpfe_initialize_device(struct vpfe_device = *vpfe) if (ret) return ret; =20 - pm_runtime_get_sync(vpfe->pdev); + ret =3D pm_runtime_resume_and_get(vpfe->pdev); + if (ret < 0) + return ret; =20 vpfe_config_enable(&vpfe->ccdc, 1); =20 @@ -2443,7 +2445,11 @@ static int vpfe_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); =20 /* for now just enable it here instead of waiting for the open */ - pm_runtime_get_sync(&pdev->dev); + ret =3D pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) { + vpfe_err(vpfe, "Unable to resume device.\n"); + goto probe_out_v4l2_unregister; + } =20 vpfe_ccdc_config_defaults(ccdc); =20 @@ -2527,10 +2533,11 @@ static int vpfe_suspend(struct device *dev) { struct vpfe_device *vpfe =3D dev_get_drvdata(dev); struct vpfe_ccdc *ccdc =3D &vpfe->ccdc; + int ret; =20 /* only do full suspend if streaming has started */ if (vb2_start_streaming_called(&vpfe->buffer_queue)) { - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); vpfe_config_enable(ccdc, 1); =20 /* Save VPFE context */ @@ -2541,7 +2548,8 @@ static int vpfe_suspend(struct device *dev) vpfe_config_enable(ccdc, 0); =20 /* Disable both master and slave clock */ - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); } =20 /* Select sleep pin state */ @@ -2583,18 +2591,20 @@ static int vpfe_resume(struct device *dev) { struct vpfe_device *vpfe =3D dev_get_drvdata(dev); struct vpfe_ccdc *ccdc =3D &vpfe->ccdc; + int ret; =20 /* only do full resume if streaming has started */ if (vb2_start_streaming_called(&vpfe->buffer_queue)) { /* Enable both master and slave clock */ - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); vpfe_config_enable(ccdc, 1); =20 /* Restore VPFE context */ vpfe_restore_context(ccdc); =20 vpfe_config_enable(ccdc, 0); - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); } =20 /* Select default pin state */ --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519244; cv=none; d=zohomail.com; s=zohoarc; b=Sj3kMj+Ko47x/KPUxunNcJpFUPnY87W8jGiFQMsuCewArxvaQAwR5fYGJEiFt0QJwGOkljRENSI+5MSMtNzdBMFy2zsc7Wu2unm0lJvW0GWJn6x64m8aF5bpM7TIciqZT7wAiqnXMmr9JJ4IbsBiDohlBXWVPWqUXnZDt5Qzxaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519244; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ekBNSaGAbkPoM4l+VTwHrOtr6ridwSwjQfLGetcTkbM=; b=Nvb3nBu3AFihcEfBrfTve1jE0xu8m1IR6mw+cEmXUrSy5sxb1coiE/uJm/3Ww4FqrYoh2+0mzxIvBE8Tq9ywO7Bji9QEiHQcoGtZ3mO7uSpT56B32c1x8aL8TOfDssLGLyjrLNYfhK+sjMkA/6tcUM0EDr/eyb4C4v/w2bxNIM4= 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 1619519244654914.0867118179801; Tue, 27 Apr 2021 03:27:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235703AbhD0K2G (ORCPT ); Tue, 27 Apr 2021 06:28:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235304AbhD0K17 (ORCPT ); Tue, 27 Apr 2021 06:27:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E24CB611F2; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzw-LS; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519235; bh=euIQLwDaPDSgWFx6NM45FK2bpju26XjkPQY0ICj4Fck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5fSA5LOibNGMYPA1Zp+9c/obPnU5Jakea77X+sfyVZD1AbcxM+wz45KtcseD8bNm 4KD7oFM2gDFXeB3CAvy7Vp4Z1Pvd4kNk/u2KHTVriRp55zVTWvp4hO/9aVgPIfULYH ek2JL00/fnm68LMnquJI1vcAo7Gx9eAQdu8YNAzWx2TZeN4luu0iPPxUiKt2YbsqQq Ey26ocTLTDuHk/PokhKcaFxFQE3lrLtjATLKqFusiPHjGUafuSxFdDDFqZXZU/oLbx zuKhsEgsojEcGmBQ8OlPk2v72wytbr9pfV8V9DoryqOg//I833iMiR8AwXZUx3+tWK AqYGEAlMoFq+Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Gustavo A. R. Silva" , Geert Uytterhoeven , Hans Verkuil , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 15/79] media: sh_vou: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:05 +0200 Message-Id: <3d2ef55f0ca6f4f58804b402d0d1bf176bcf9791.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. While here, check if the PM runtime error was caught at open time. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sh_vou.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vo= u.c index 4ac48441f22c..ca4310e26c49 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c @@ -1133,7 +1133,11 @@ static int sh_vou_open(struct file *file) if (v4l2_fh_is_singular_file(file) && vou_dev->status =3D=3D SH_VOU_INITIALISING) { /* First open */ - pm_runtime_get_sync(vou_dev->v4l2_dev.dev); + err =3D pm_runtime_resume_and_get(vou_dev->v4l2_dev.dev); + if (err < 0) { + v4l2_fh_release(file); + goto done_open; + } err =3D sh_vou_hw_init(vou_dev); if (err < 0) { pm_runtime_put(vou_dev->v4l2_dev.dev); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519345; cv=none; d=zohomail.com; s=zohoarc; b=Bu6wxZhdoencmQcfOxtiT1f2RpwEBeW5h1ZS30tGfPBGBOJEGWIzGv0HSdmLwkjot0Z1WvdyRaaCIjNo6KpnI68xouItbw6l9aBONRy02IH+9p6bja8F6BioWDZS5O9tC9RtoaDMC2HKbuPXUxeJ0Xw6vHQToSeC3xF9siuVusE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519345; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uvxTCk9qFVRZeWu4OWV5nbuso6Js4+D7jvAIh37TJlk=; b=acxcVO2JV/I6IA2zrezZKqHWEWVyfttEpy/dYjIO/dwOzs3aFN7JVa2VUF2mciC8M8xClD6UX+80T/rZPqBNb9VBtKFf5N4TV4O+2T4zIDIGKIsIsMp9oPw5+UF8XSo+iRkNDjL1iNx+QYKrnn+5aBNmqZnKzynIDcvy7KjDO+Y= 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 1619519345603487.3213864128288; Tue, 27 Apr 2021 03:29:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238043AbhD0K3r (ORCPT ); Tue, 27 Apr 2021 06:29:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:48138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235583AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 57DE2613FB; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000nzz-NK; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=dO1gD2vCTyNaQMmr4CD5RrufRsq5HOpPc9z13n0Rohk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fbWvtVHWTAey+hipESaA7D/+JGsH4iHUJ5QUnJWbaQ90t2lqsJR8DxjhYJ4tZY9NE 7sUWaQNJ58a/gx21g/v8U9+dTCqhpPqqvyzXz6440q615rfHwbz/ngOS98Gv1aUW1e 6F85UFHzWeu9qFsabeZwnEBYC2YHI8XMNNVPWrkt/LdI19wuwtWCzlfILd1kFofYH6 ZJwI2DHv0V03BLexWkLKicITH1k/ksrp8FrP+wEaIPMwLy8+d37OwN/pVWARJFLSgO m8PZs/ofoceMQDgm+qgcZRXyBjxHu7KWFqlqaWUu3rXaTFPxccq6ndoUYBczc2Vo12 VxGae3nG6bBwQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrew-CT Chen , Matthias Brugger , Mauro Carvalho Chehab , Tiffany Lin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v3 16/79] media: mtk-vcodec: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:06 +0200 Message-Id: <5ecb7c839255ae1b74a4f623cad05cc1a1ed3efe.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/driver= s/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c index ddee7046ce42..fe096fe61c9d 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c @@ -92,9 +92,9 @@ void mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm) { int ret; =20 - ret =3D pm_runtime_get_sync(pm->dev); + ret =3D pm_runtime_resume_and_get(pm->dev); if (ret) - mtk_v4l2_err("pm_runtime_get_sync fail %d", ret); + mtk_v4l2_err("pm_runtime_resume_and_get fail %d", ret); } =20 void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519250; cv=none; d=zohomail.com; s=zohoarc; b=fJcdk1kae8WJJGq9Ht6nLy+2uBaesSHFZF/BzYIjM4ner5hEN5ZIUFqh30wWM4jbS1KwoWePZswVG03e+K08YK5gh48TYTJ2HhfG2muXhZ52XeV4+WrZmjPq+Ho+ggi9NjtOA0uFsOkgooNJYp23JBXXvCq1mBdRq9u/VqKukIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519250; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jRs3kCxj+As+g9pcmhKqvb7XbS7lWnL6DNo95j2Z3/k=; b=g3r4WapJ4x2DafyJ3++j+UvXeySEyIuVkKLk0OyvPuHZsmkUwm7NEC2NmdwGaYZUL8aPRQypLfNhZ40WKW+jfFtqJrbwtjgZd8zXD8XizQyGlknTrTWN7iOGuWfw6sHNcoar7Yb1EmkL86/jLIfqOORkR7moZu1CiFNK20x8V4g= 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 161951925003529.09540733906681; Tue, 27 Apr 2021 03:27:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235764AbhD0K2L (ORCPT ); Tue, 27 Apr 2021 06:28:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:47702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235353AbhD0K17 (ORCPT ); Tue, 27 Apr 2021 06:27:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E9EB6613B0; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000o02-PS; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=cJmIogEt8DtaRrLuirE0smJSOENxo/aAnd7cgWYfYDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=an5zXV4X4Z3N7pCHC/a/6eYE7scIqU4vlkIl+I7UH2FlGFBDBxKWTw6XmhfMDOITS VHft04reu6+NJE9JmenhS5NxnuekX3RtZ0ipRFGENclmNwHrveYuRGAo9cES6dQH9S YF87XkXE25CYGMNoRznmrPZ5amfrFy6Qk3y8Q1ulo82EJgWa33cVg2d9IuE5Aci9e4 NJgU+orRAJb4ucqo86+R7URiJqIE9D25KyNAsmM7t7b8LZRpKbUt8w+ue7pu2lBBN8 FdFl6ZnFLoOO+DWqn2dLwfKiZloqt1IyvR7K/XTcrOvcT8fzRaITg30hlt7aDtcqqU FYpkEtiYCZkHw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrzej Pietrasiewicz , Jacek Anaszewski , Mauro Carvalho Chehab , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 17/79] media: s5p-jpeg: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:07 +0200 Message-Id: <7ef9d9ec7810a6d2ff53ba8685fcc91a952bbbb5.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Reviewed-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/pl= atform/s5p-jpeg/jpeg-core.c index 026111505f5a..c4f19418a460 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -2568,7 +2568,7 @@ static int s5p_jpeg_start_streaming(struct vb2_queue = *q, unsigned int count) struct s5p_jpeg_ctx *ctx =3D vb2_get_drv_priv(q); int ret; =20 - ret =3D pm_runtime_get_sync(ctx->jpeg->dev); + ret =3D pm_runtime_resume_and_get(ctx->jpeg->dev); =20 return ret > 0 ? 0 : ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519517; cv=none; d=zohomail.com; s=zohoarc; b=PkNYnxTr2RN2+Ia8fn0lD9xcEiKJBbyAbC3H76oaEmDoBJuBRFsE8AHzStssoEef/kkxJ33CbMkXBrjgeXin1UnKh3UwX962G+2mZYjohOm86nA7F4CwUTow9t/f1ppo5iptDFXr8r4zAC+9fw6FZe2sUKbdjjuRMpeD2o/+hZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519517; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C+8RKgK/OnL+QHhGGein0t5DMeTIWaENTPOoBZjyRrQ=; b=Ct54G2btqKVCyNQvKljKXstkBbFkTtTvfJhJabQUb8t9d8i4rOZGTrtCElO2U8LkABrqqvn3HPWgGHTWgAO+nBj9wJisU2Uzt5l0MzNQGEaHeUomJTl7HIe6C8O0LqBuxiOxrHX4C9phpRxZP3MsBbUfyVCokBKSSs1UP6d9pzw= 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 161951951770742.512600209615925; Tue, 27 Apr 2021 03:31:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238267AbhD0Kci (ORCPT ); Tue, 27 Apr 2021 06:32:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237505AbhD0K2X (ORCPT ); Tue, 27 Apr 2021 06:28:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6C88961405; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000o05-RL; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=U3xPtY+HT1GPqKz+iC8qw5pPuPioh4afaqfdd0R7SD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXMAigZdnmTu5DSfhVBGfcBPGN3QF6ScmmR9U0f5Im+LPTYBWoyF4ySDewljMfoBD DuxyJAJ1gMLQ6p55STB+KKwr+WrJSR7g3hnugClyn/E78d90b8STIoDxT3xQBiV/n6 uL9M9bbEpXbNuIQnbmAm5E6JIWT6+V0tJ8evbx22wxlqQiTfw0l7nXGaV0I87B1VBa XKR/bd4QEFA1Zsi6T9nSKagVK4WUpXZx+4aEhq9gXp+buv8+jKMExd9Xs9e8eBkQTf giDONGAEmXjeisYXz5b0fJau6kz4cBUwC005YzBRs308oiacNrkhIZWR3w4YC0Vp3Y mLWQ5E/mVhnYQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Hugues Fruchet , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 18/79] media: delta-v4l2: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:08 +0200 Message-Id: <364e0a87973ec4676f1aa16b3373a0c95f0366f0.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sti/delta/delta-v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sti/delta/delta-v4l2.c b/drivers/media/= platform/sti/delta/delta-v4l2.c index c691b3d81549..9928b7c46a41 100644 --- a/drivers/media/platform/sti/delta/delta-v4l2.c +++ b/drivers/media/platform/sti/delta/delta-v4l2.c @@ -1277,9 +1277,9 @@ int delta_get_sync(struct delta_ctx *ctx) int ret =3D 0; =20 /* enable the hardware */ - ret =3D pm_runtime_get_sync(delta->dev); + ret =3D pm_runtime_resume_and_get(delta->dev); if (ret < 0) { - dev_err(delta->dev, "%s pm_runtime_get_sync failed (%d)\n", + dev_err(delta->dev, "%s pm_runtime_resume_and_get failed (%d)\n", __func__, ret); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519361; cv=none; d=zohomail.com; s=zohoarc; b=IqRIdGsEURhabfLtTuBjEaYXOnqc1YcrcIMF/AEbYyCj0bXChU3Xi8j2/mcRKp2+0NJFXejNkgs9Q4odXYI/HhMRAeJsiLMO9AYl1+5fvNwLj7zyR7v3dLeaDsRV1H/RKPUbCQ9FHdn67g3aWXbEmK/pxTpqNxKBbFXKhre1LgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519361; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UfqjQEksWt8M3LbdegcX5y2dPdTX6smEgNNd5wbgyV4=; b=Zza8NOB+c7rEEMEBvn62CRcQVUMgeucgnyae7ZF/BE2iciJ38PPc0kDxUrnXUgYxt2gVjpHp4C8PhxDGu6ZegpktTHpz6I8oJDXuh6y6W/+TicN6q6tM3IhpcvpkljznmSuOI45eLKyV/5t8SAO7SNdi5N+oMinzh+bvskO8ESw= 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 1619519361441123.88340231973939; Tue, 27 Apr 2021 03:29:21 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238215AbhD0KaD (ORCPT ); Tue, 27 Apr 2021 06:30:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235588AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 46FCC613EB; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000o08-TE; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=W1MZ5fUp2z9NMPUzLbsMjuPOyaCJXem6s4s1Qkfcwz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLF0JIKVcHE2UEV6cQv+g1qO4yemGW2SKFuM3SYd7VqD2ys05vpnP0xMOJK9EWXy3 prT6gwlMxkUUseGLNvpXTSxdtlTuFwVkNPzQMphS3YVaelsMJzsSjRnAUYdZ+ts2TB aR8fWmDd1Kax/uaqORtgaYE1TGAoHly7Xj95nXrOxBFslL2/cwDXbPNI6mHoDKS8K1 NpKvkWpuv+i9pEGF0X9vt8g105thpBgU/k+SQJSkcJfs8Ooz0Z42f4pzJd01XIvfLk 97DJo3kLZL5XOzRqCur/njG3atGe4kpuCsPq4pAXhAGLAeFb7D+RG9VvwbCxrxfqWG E4O8FvLQl5sEA== 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 Subject: [PATCH v3 19/79] media: sun8i_rotate: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:09 +0200 Message-Id: <2ea29dfab3849fc6856f6a196850ae711a61d4a8.1619519080.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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/dri= vers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c index 3f81dd17755c..fbcca59a0517 100644 --- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c +++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c @@ -494,7 +494,7 @@ static int rotate_start_streaming(struct vb2_queue *vq,= unsigned int count) struct device *dev =3D ctx->dev->dev; int ret; =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) { dev_err(dev, "Failed to enable module\n"); =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519385; cv=none; d=zohomail.com; s=zohoarc; b=AgdtbbKzvf4rz3RdUtuiebBB5AaTlkg0FPzFIjVM5yPuVBOgu4iUo7luzOh0CQszdsyEefShuirJvs1V7HheaLLSXmv6PwNTgmRaUA5Cbn7u+yYJyGomjPEQOAdyScZBfvhbdbkolhxCC4g7P0yFuMG0tCtumMo4eAIMLrq53lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519385; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u5PcMNolJ+Hbjx5TaiiRECAjrT7wB+0xPtci4EIZYbc=; b=XUzmYtBKLLNbwNlleKjeE2gOF/SlCwSM5aPm9vzgpIP1BqdkkWzeT1uLqhMkXnsJvxr9538SPC4XwUM9zGotSDOQdW+lv6K91eIvFJ1WG7d46ZudqwyQWvoMOATZtVGxIi/4hWzEmpMHjqNYU8uIgbC/+W5UJCW9zIkloH6J/No= 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 1619519385318867.2256922684548; Tue, 27 Apr 2021 03:29:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238500AbhD0Ka0 (ORCPT ); Tue, 27 Apr 2021 06:30:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235600AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4B585613F4; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvv-000o0B-VD; Tue, 27 Apr 2021 12:27:11 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=LvHrsFJn6JLbIexuKZaI+hIEIjqhrM13uG8Z/t+ytHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gizOl2AQe/jXLKmc+7i83jA+O0Wo1bF6j4oi46pMEcTl7/BWz6lVm/+PTT8Sv0cpO tE5/VhfSYR4We5KtkO113SGvLMUzmduFSIHzuiuQBzef91tj88BXNlDkG6NUY4JBqB VL8b7iCr5xf/1C9QdifZSnkYbv6fiIqCCeuB4dYEmt9p+MbUHovpznskbX07qJ81UM 25YLoBBo7WyY92slmjLh0f7EtDJwRU/OFoHvzqxUxfwwDWieX0AlZ73N/jq4mnSYzu yb4V0aKvZfD2iBqVblPOy29YITyz96H9PvTVjgXmwX7SgOe1liq56ppEuzbr4JskMI 9vV/neCiQ/MIg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Greg Kroah-Hartman , Mauro Carvalho Chehab , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v3 20/79] staging: media: rkvdec: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:26:10 +0200 Message-Id: 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" The pm_runtime_get_sync() internally increments the dev->power.usage_count without decrementing it, even on errors. Replace it by the new pm_runtime_resume_and_get(), introduced by: commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") in order to properly decrement the usage counter and avoid memory leaks. Reviewed-by: Ezequiel Garcia Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/rkvdec/rkvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/= rkvdec/rkvdec.c index d821661d30f3..8c17615f3a7a 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -658,7 +658,7 @@ static void rkvdec_device_run(void *priv) if (WARN_ON(!desc)) return; =20 - ret =3D pm_runtime_get_sync(rkvdec->dev); + ret =3D pm_runtime_resume_and_get(rkvdec->dev); if (ret < 0) { rkvdec_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR); return; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519266; cv=none; d=zohomail.com; s=zohoarc; b=L4yO/PR62LGrLbRW83vAFU/gRmoCHABfwxMf5UU38sEzNCA/vlfoPQogVQODfc5F5X8YTaOXix9ACh8CSfEnYrND0OdQn1qLKHCY92THm+3Z4Xl7rNwHg2SxYZUyH6HU+dpo/CcTxkSqMF1L7K/YP9hSYqG5wotzqEfAO9qGbt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519266; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y6HlWb0wG5TGvMKtCgYuawiYodsGrht96o2AYGryVBQ=; b=DUrbnwUxMWIJCjbCXoMfDlNQopvP1eie4HABI4lH6LgGp07GLUX3BFwVaJTlCWZ0TtEmiv/7wfGq+JZIUmAyeW25hKUISxc3dJdFCNJUQQJi2ZNK6Y5mALPDgv2w5L+fsZnfvnMYK+H3TBC1K0svlyq8411xYYcFrSD2hv3Z8T0= 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 1619519266229625.0204879072791; Tue, 27 Apr 2021 03:27:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237825AbhD0K21 (ORCPT ); Tue, 27 Apr 2021 06:28:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235457AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1709611ED; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0E-0q; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=ZOYDC8nizVOemN97ng0w67F2uxMXkIsqLhOdGgCw1ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oq+R/VRITgn0pzbnpFdIQAyKQNwdBKvWD+Ctlx3IOzAa7StcMwidOkcuOnW2bmUg7 LvWjSH5SDVPW+kqytaoS5O3EFEil+AiNZv+2yVYDCkimAnLqIMAxfsllaAQfB9oT2q zHtZujH6YEIJ0j/P7SIVEsQSDSeTfvJR0Qu0sxB0boD5z0ng3qHYk7VDUJDdP6SS0I OSkNDvXXvh2kPKYmvBRbVMHF7bbi2QKVjhav2CASfrZejCevDzZlGgGlixbfWl4g/W wMbSqNlCKhlF34YEWhg3tCoiDykSa7Q/DLjYndGgB6YMqL3JssyEZH7ybVqYcGpeUA gstaADeXO1HZA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Greg Kroah-Hartman , Mauro Carvalho Chehab , Sakari Ailus , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 21/79] staging: media: atomisp_fops: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:11 +0200 Message-Id: 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/staging/media/atomisp/pci/atomisp_fops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/sta= ging/media/atomisp/pci/atomisp_fops.c index f1e6b2597853..26d05474a035 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c @@ -837,7 +837,7 @@ static int atomisp_open(struct file *file) } =20 /* runtime power management, turn on ISP */ - ret =3D pm_runtime_get_sync(vdev->v4l2_dev->dev); + ret =3D pm_runtime_resume_and_get(vdev->v4l2_dev->dev); if (ret < 0) { dev_err(isp->dev, "Failed to power on device\n"); goto error; @@ -881,9 +881,9 @@ static int atomisp_open(struct file *file) =20 css_error: atomisp_css_uninit(isp); -error: - hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC); pm_runtime_put(vdev->v4l2_dev->dev); +error: + hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC); rt_mutex_unlock(&isp->mutex); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519496; cv=none; d=zohomail.com; s=zohoarc; b=KX0X5ffrBbvab91QsCj6Y4K0oWkaWI8ol4mFIhnn0uhe4mT1evbqycyHZIwrR3VS9AG3fjuTuXWtw0TYKeBQSSTw5G/c4YKNGjZSgSJATdQ1ecoJAtX+/iAQYntvSmtDC9sBFTEl5AbAUTZby1XtdD+GAMornzDHpc/6bjweoi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519496; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mRlhHz+TXhBYOhgqqW4JThrnHdpvqrv4T1yGT3S16Vc=; b=arDXcRY9QG0rYDZ/E4M6k0xBFfUItc8we8/X90LLcfWkmAAglkgn4Gp4gMoZBSpD9WfpvvrcKoTC9Ih/YGO6JfuN3eOJwZceBXGJk+KwGvhieusoQScYc8CaantX1qyJ7w6mAdeqITRNqFFpwpxNLrC/hATxcOwq6Mz3mLgJWX8= 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 1619519496539722.3042661657395; Tue, 27 Apr 2021 03:31:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238079AbhD0KcL (ORCPT ); Tue, 27 Apr 2021 06:32:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235842AbhD0K2N (ORCPT ); Tue, 27 Apr 2021 06:28:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B08056143C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0H-2p; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=WwdunTEPlspSuJNcgiz5VlTq6QqTmYyotSIBFOxVREY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NZm6zdW+FKzxb+LsjX/Lv3L7az1xSznYI/RONnb1cXePK21Nj4oLvZmIGqx+5LALk +66OR7pZFcaY+DFAtLTiBLuo39vLrTjzoB4/nZSDLcNBE6YtqNjPB7JTGltmO6E18L UchD071kXo4eZnoYnyjz80KsGTsBunYbSShzyOdI9WzwH5NKKyzGmV3mvlUC8vYfOk aUWwBs2uJAkaGi0SZleGmhwU4AYdVPAnwOz43JpE9PTJ8a2DNCXD6vHpwFmBa2ByQS j9PT5G/0kNVTmyL1H4ZA+0hDf8I1fRfltZiBcp9Nqh2pdLCAeCvQSw5t4ILDQE1qlD eT8TShmndMtVw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Fabio Estevam , Greg Kroah-Hartman , Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Rui Miguel Silva , Sascha Hauer , Shawn Guo , Steve Longerbeam , devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 22/79] staging: media: imx7-mipi-csis: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:12 +0200 Message-Id: <706a63dc9019ebea7904acedc6d40ae44cb706b6.1619519080.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: Rui Miguel Silva Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/imx/imx7-mipi-csis.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/m= edia/imx/imx7-mipi-csis.c index 025fdc488bd6..1dc680d94a46 100644 --- a/drivers/staging/media/imx/imx7-mipi-csis.c +++ b/drivers/staging/media/imx/imx7-mipi-csis.c @@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mip= i_sd, int enable) =20 mipi_csis_clear_counters(state); =20 - ret =3D pm_runtime_get_sync(&state->pdev->dev); - if (ret < 0) { - pm_runtime_put_noidle(&state->pdev->dev); + ret =3D pm_runtime_resume_and_get(&state->pdev->dev); + if (ret < 0) return ret; - } + ret =3D v4l2_subdev_call(state->src_sd, core, s_power, 1); if (ret < 0 && ret !=3D -ENOIOCTLCMD) goto done; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519435; cv=none; d=zohomail.com; s=zohoarc; b=DBnxtPqjOA5jdgwF2sallzzKP3kSHNlCHT+61XKUjvycv03hHw9NG/VGq1XRV0wgE9nj0pPEDO2PoagGl8awQCiAAimdMZikhm3mU9W0rl3xv3n9coj+fYPiqnDOIFtdM/4OOCbk2Hovjn/yuESY8t3dFMk9SxQG+y4KnsoQAks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519435; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l6aq1rDYXc8S2Y/cPQpdQZkWjHGy8ZnnKWXT+KEof2Y=; b=WxyvXMnbr5ZNj2e+lbeTC0jrYLiaZ+AG24SbKuiHqQqpdhc610hvuuA60TpJuIMDWj/JwBpWoE+zjZPWZRFABKftYo6tRQ0VdX7v0yc65REb+Hkwy4wul92gNIVz8gzdBee30gsGP+JCOd6dtd7/42UAVPWYerzG7lGvwXEKAfk= 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 1619519435196793.614682649764; Tue, 27 Apr 2021 03:30:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238567AbhD0KbQ (ORCPT ); Tue, 27 Apr 2021 06:31:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:48226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235745AbhD0K2L (ORCPT ); Tue, 27 Apr 2021 06:28:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6488961401; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0K-4u; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=9FSuKWFuUqPUC2dP9taAm5sC7kLWnC4fEOP9jl+QpYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QY/7spUb4xHt2c+pEbJSl8E7YK4mRX7fk2MMnW+kU0w2o7g3bdn+6a1hPrMmZJSfi fntk3BoV7yh4E7NRP7I3n7LDfWvDCzYpN9Nk4JlztFbLmeDBtppIQWtZ3sjng1mm8u ebJMRz/muLX2vi/Q/lAmcBdkJ0LFsvOi2SGEBOanrLLTnbZ77TwrBkx1BEwFM3+VYo JAXm74kBxtNh/YR4iax3T8V+irNYOziZ6in1f9iMlEuXpYlwQ4GECl3GQorGys6yyY Lfk7s7h9sW0xRf15A+JyQL8zEkMut2k3xr4+wVw1vZJx9rZiRxrImaxrNWJZhICAiQ lE/ds4RgcLGjQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bingbu Cao , Greg Kroah-Hartman , Mauro Carvalho Chehab , Sakari Ailus , Tianshu Qiu , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 23/79] staging: media: ipu3: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:13 +0200 Message-Id: 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/staging/media/ipu3/ipu3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/ipu3/ipu3.c b/drivers/staging/media/ipu3= /ipu3.c index ee1bba6bdcac..8e1e9e46e604 100644 --- a/drivers/staging/media/ipu3/ipu3.c +++ b/drivers/staging/media/ipu3/ipu3.c @@ -392,10 +392,9 @@ int imgu_s_stream(struct imgu_device *imgu, int enable) } =20 /* Set Power */ - r =3D pm_runtime_get_sync(dev); + r =3D pm_runtime_resume_and_get(dev); if (r < 0) { dev_err(dev, "failed to set imgu power\n"); - pm_runtime_put(dev); return r; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519324; cv=none; d=zohomail.com; s=zohoarc; b=hINLeh4g7dkXMhysPulrijC3KBWQ7lh9Te4RQcqgElKwqaf3bRT1yz+64lE+sOE7DzPRaHAqEs/KpYecQgNPboy/h8/LKtF8wBFof4EYVUJ1aPzruJqQ8iJd6kOBKg5FrWasxlT2C/pybvMGNcqSZaJNOrdzYITk728tA9dzFuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519324; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sXS9N7lOxdaSuaR1jnhTDEntcWdQ9KSZnVkdsdKbNS0=; b=gREnyo3qi0mSvvCDOLmm+NFPRRYWzJkU2wUJhWYl9LI4cK4Q3pQEqJWgG9c2tq45eGLwVkdWRc3mk56U8HaRdKmIJ4YuCO5B6kjFcZlqZ9xOXSmdqMaEywpj7G/80KWw/IKXDFv0E8YnMnIFt81razIDnmZ6zvYVqM38+pClerI= 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 1619519324348819.3729369880185; Tue, 27 Apr 2021 03:28:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235540AbhD0K3X (ORCPT ); Tue, 27 Apr 2021 06:29:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:48204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235553AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06AB1613C9; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0N-6t; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=P8ySBvxIssOsYGuosUcRi8p/mrvcDEnJfSep5KVO8S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WMkCLvyRBYSYTkhDOyp4uEi+XyTwkxe4+r00fVlVDME2C4PbtgKrgOGwIP61fbThr TZqAO6mrphnoVFdSRn6D7hSY3QHjYrGcCkX7anEx7b76HWe+A/3fyMOI58a5h6S+M8 KZNl70IzqQkfBl8iHVhmfD1cibe9wavoXBLsQV46Vy3ku8oNqBV8An3jv90pGR31P9 TDGLviO/kPHmmeJEMnc0rl/ri0NPt5WwGHqYvONhp18vF4dntXQotItmqXyuIAHdOR MyHrsn5zZQF6be9pQcCKpwagOZ1N0RlzONmzArOr5z9kfrQPJo6awblllhlTErYuR1 o8a3qdZ2K5sfQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Chen-Yu Tsai , Greg Kroah-Hartman , Jernej Skrabec , Mauro Carvalho Chehab , Maxime Ripard , Paul Kocialkowski , devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:14 +0200 Message-Id: <991f59e8ff469c6b0e410db2aca6a1d3885b03d8.1619519080.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/staging/media/sunxi/cedrus/cedrus_video.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/st= aging/media/sunxi/cedrus/cedrus_video.c index b62eb8e84057..9ddd789d0b1f 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c @@ -490,11 +490,9 @@ static int cedrus_start_streaming(struct vb2_queue *vq= , unsigned int count) } =20 if (V4L2_TYPE_IS_OUTPUT(vq->type)) { - ret =3D pm_runtime_get_sync(dev->dev); - if (ret < 0) { - pm_runtime_put_noidle(dev->dev); + ret =3D pm_runtime_resume_and_get(dev->dev); + if (ret < 0) goto err_cleanup; - } =20 if (dev->dec_ops[ctx->current_codec]->start) { ret =3D dev->dec_ops[ctx->current_codec]->start(ctx); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519696; cv=none; d=zohomail.com; s=zohoarc; b=A0zgVn6tfPyEeOY/Pj4nKI1lxVNpe1QpVyE0XpKhZUw3o6GUDDtlnH6dCBvvNxJRV4YXSDWq7F6xRvYeYigfZZApMaPQH5yi9YBgcfDrXy0B9rcyz2+0nt4Us78rh8lMMBTWWFb1vXIn3p8VT2SwToPjctn4psOEn/FaMU/7l+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519696; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4MHdtY8j9PnnXg5fLzOr2wfQzo2yPTPoUTUBaKcVnz0=; b=NLbtuUiEwJKn/r7awpJjqhrlNleCn0qvL0M2DAKRNE/GZ/gfjt4EMTkrM1p6wg9RllWT4EJc1qPZiWWHBbpRv7PGfnyvBTI+Uuvzt466MmLHobVrOk9pZuiJ57gtmdV7GLqjd/dx03dcKrImuP6wVkyQFkoe8hHczQS1N7TOgQY= 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 1619519696331715.0209494919808; Tue, 27 Apr 2021 03:34:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238876AbhD0Ke3 (ORCPT ); Tue, 27 Apr 2021 06:34:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:48288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235478AbhD0K2m (ORCPT ); Tue, 27 Apr 2021 06:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF0996144C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0Q-8p; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=eeb2tTMTeECwFCJsmdUEhrGisH5F5adY0i6Xu5Zdqhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SwSkxNd9WEi1Bzs208u3NSlp7TvU9R2NtZctra1LltP5RKAv8abVn9OPGsTjRwvML JD4wztwvcCU3tIsQG2CWTbT5WYaE8nmsWzG29l+QSEZC3joS5EN8U09T7lzmr+UiqQ aJhJ2xeWT93JOIJ8zgbCbUHMsPUBdpZT/q9m9MIkIHE8boDHuSib3PVyCE3vIlx3kZ 1K7BjOYQTe9Ti8ZVJnDDmXz7v4oZrnEsYg9Ci71nRLcJzVuD2RA63KeQpfVRs+MABN XD80kXDN5VxYWaunuiKWQV1MmeHhDRa9VggbJtUBSoErbd+K0e75+v/85OExHlVcsF QC4yoVchCIyXA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dmitry Osipenko , Greg Kroah-Hartman , Jonathan Hunter , Mauro Carvalho Chehab , Thierry Reding , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v3 25/79] staging: media: vde: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:15 +0200 Message-Id: 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/staging/media/tegra-vde/vde.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/staging/media/= tegra-vde/vde.c index 28845b5bafaf..8936f140a246 100644 --- a/drivers/staging/media/tegra-vde/vde.c +++ b/drivers/staging/media/tegra-vde/vde.c @@ -775,9 +775,9 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde= *vde, if (ret) goto release_dpb_frames; =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) - goto put_runtime_pm; + goto unlock; =20 /* * We rely on the VDE registers reset value, otherwise VDE @@ -843,6 +843,8 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde= *vde, put_runtime_pm: pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); + +unlock: mutex_unlock(&vde->lock); =20 release_dpb_frames: @@ -1069,8 +1071,8 @@ static int tegra_vde_probe(struct platform_device *pd= ev) * power-cycle it in order to put hardware into a predictable lower * power state. */ - pm_runtime_get_sync(dev); - pm_runtime_put(dev); + if (pm_runtime_resume_and_get(dev) >=3D 0) + pm_runtime_put(dev); =20 return 0; =20 @@ -1088,8 +1090,9 @@ static int tegra_vde_remove(struct platform_device *p= dev) { struct tegra_vde *vde =3D platform_get_drvdata(pdev); struct device *dev =3D &pdev->dev; + int ret; =20 - pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); =20 @@ -1097,7 +1100,8 @@ static int tegra_vde_remove(struct platform_device *p= dev) * Balance RPM state, the VDE power domain is left ON and hardware * is clock-gated. It's safe to reboot machine now. */ - pm_runtime_put_noidle(dev); + if (ret >=3D 0) + pm_runtime_put_noidle(dev); clk_disable_unprepare(vde->clk); =20 misc_deregister(&vde->miscdev); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519380; cv=none; d=zohomail.com; s=zohoarc; b=CYE5n3ZQV6xd2v36NNR61WNKSapdIvEOREoRX55Pc9xmixvVhkv+jXKme73hemJJvToWGz7ZwvY+diMt8xaFW9kMA0mK/tORSEnrcXgIKenD28eIh0vShtMopgW81mwV+r0pJKNJqcnxs5KvjUKSAUIbdzXaT/caS1Edydkb0Ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519380; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iOjKgZ8R2lrQr7igC32ED+P3Dc8h0D/7Fb++A4cB9yU=; b=HnwkzMA5bARGpLd+yMdhDxVkjlfVPyGL67qUe/W+7dDJCxsI/XV0HO/+KUza7nvRkKtzHxoThC+y7fbJ+JdYpXuN5brPlOJjJZ7o+2NO32i8nKUPuyIWhlVBSdc8s5BgWh8MMqexRol4LFzcpb7rEp7+t+FceK1uqIwjdGCPJ1s= 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 1619519380350685.8500003493247; Tue, 27 Apr 2021 03:29:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238462AbhD0KaW (ORCPT ); Tue, 27 Apr 2021 06:30:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:48270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235596AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5FCF161400; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0T-B0; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=WbRKhLLskO1RYUogcibQypEKrmLpBP5nHtIha3xX034=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pztCD5s6it4yKv4ZyOriU2MAs88ON/p9id0SD4J0Tv/V0rwdvq/zaEqKbRBaWYoiv jHTFxaXZgY3iRvQhKTJA+vAYjyhGf7pfZlrhXom//FzC3+6uK3f+yzKcHg1esax10R CvCe7j1/Qoqnl6ARzMIKRooVOYddGnFlrmRdkV+rxf8bMFFETm/uOozASatERWbTIg Tgf7qAJLJ1APVWrgQu3bKUg79c/uc88aTjMYN/QUzJRXf+5vIEXLvQP4VANHKSSeBQ eO6OsaIlojASKu99Xd22jSYdx3qon7LfKfCruGz9WSpZoy/z20QUJqTrUKvG7JR6pi 2cbQmW82b9jUw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Greg Kroah-Hartman , Jonathan Hunter , Mauro Carvalho Chehab , Sowjanya Komatineni , Thierry Reding , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v3 26/79] staging: media: csi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:16 +0200 Message-Id: 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/staging/media/tegra-video/csi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/medi= a/tegra-video/csi.c index 033a6935c26d..e938bf4c48b6 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -298,10 +298,9 @@ static int tegra_csi_enable_stream(struct v4l2_subdev = *subdev) struct tegra_csi *csi =3D csi_chan->csi; int ret, err; =20 - ret =3D pm_runtime_get_sync(csi->dev); + ret =3D pm_runtime_resume_and_get(csi->dev); if (ret < 0) { dev_err(csi->dev, "failed to get runtime PM: %d\n", ret); - pm_runtime_put_noidle(csi->dev); return ret; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519535; cv=none; d=zohomail.com; s=zohoarc; b=YUwVcEmzOtICtwgx4kzTbEtF5olmp2X4kqLt/6U+Q7fAlymEh9iUrCVSc8g1vkh9ueZYftbsWPVSNJ49PXN5q5+G5P+OiqrP7kn04fNc9tT2ezhn/azfIgoN+TU3Y05wjTHwrdCh6Lh82JIh/bDYVbJNPbFShcpF+LaviL1EVCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519535; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DakkDWNoT1M4D/YYmRBDfuW+1BlBwNdKVbEDRAisZa0=; b=K3v63cASMESN95zmPyezwQzPQjwH62rYUK8RRenBJxTDGFuPjz9ACBL/L65ETJFkRT3XdwX2g8ndTLKd0l1/tGay8Dm616jRcLQK+SPRaSfxlM5Ip/6fW50eDh0DyxsFmGLBdUhIJZwqHY6m2ZJEyWRazm0NjLOvEAk0NADA8fw= 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 1619519535395684.5944652568357; Tue, 27 Apr 2021 03:32:15 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238705AbhD0Kc5 (ORCPT ); Tue, 27 Apr 2021 06:32:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235743AbhD0K20 (ORCPT ); Tue, 27 Apr 2021 06:28:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C1E1B61445; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0W-Cu; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=ilbYi39Wp/s1IHEjQb8NZRh7PLiRnT42XXdFX8lFSpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E1V4ib0zbZH+kCUd5H/K3zfdYxnn6eIkc1o8FSQsvNaEok8VvLUUH3V9QiLL7DUEQ dN9W7MRaY2i3s+ixNN13NayXIcIBJcsrxVQQRqyUc36hl2fIR0pxBuN0XmkLsXUnCE R2Z1r0hX+Tfy1uGelCFiFXxgFeQFrYyf2NuxURXOX37gzThSFqOlSJdoazXrYdstXu 6CCdBuM2PC1AIti1Hg/1pJXrtHFtG3etjGFzlHWSamm/J3Z7yrWfdgCytXqIxDc31k zeDVLsgxC4qnAUxhELuCUJU6AAt9nCNSo4MS1RQT1jxHOCWBioubSk9uZC0BbweNuV Gc3epVSD6SYYQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Greg Kroah-Hartman , Jonathan Hunter , Mauro Carvalho Chehab , Sowjanya Komatineni , Thierry Reding , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v3 27/79] staging: media: vi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:17 +0200 Message-Id: <4ee32d7287e0839f23f18e8b9bf1829328411a67.1619519080.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/staging/media/tegra-video/vi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media= /tegra-video/vi.c index 7a09061cda57..1298740a9c6c 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -297,10 +297,9 @@ static int tegra_channel_start_streaming(struct vb2_qu= eue *vq, u32 count) struct tegra_vi_channel *chan =3D vb2_get_drv_priv(vq); int ret; =20 - ret =3D pm_runtime_get_sync(chan->vi->dev); + ret =3D pm_runtime_resume_and_get(chan->vi->dev); if (ret < 0) { dev_err(chan->vi->dev, "failed to get runtime PM: %d\n", ret); - pm_runtime_put_noidle(chan->vi->dev); return ret; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519598; cv=none; d=zohomail.com; s=zohoarc; b=VJjlL0W6xA9XrMjnRK94Vy+JIauAJdNReCsfFnIOdC4TLgfAuq09yHTFSOlmj6CR67Dq7VgxmPxE065S1iIEt6u3rZ1BB0ZQg0OVTfqeithlCmxXJysmlY4nRwuJhOpZvjcAhor7Bhawuix1m7kM7FMruRlmT94ZglUS/4g9kXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519598; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SGETvmJFs0ZQFQn7FyWxwpvIUEXgYvYAvG0610/gANg=; b=X3C88wa32hWSGLOoCSx5zPIKCmAILZK9KEaQ+l6yBo6/cfLFcR8dxCrCcT4j0BSZoulk7tNrTLiTBoJrf22C75Uvs6t2zYz+FZk6nnFfKyRuOqYFWpQWyBMQP6HiWaKRaazKkSXU1BNS0nJFGnFFSiuQqAc9tShyL48Abg9TzBE= 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 1619519598127950.5797637335868; Tue, 27 Apr 2021 03:33:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238129AbhD0Kds (ORCPT ); Tue, 27 Apr 2021 06:33:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:48172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238012AbhD0K2c (ORCPT ); Tue, 27 Apr 2021 06:28:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CF6A36144E; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0Z-Ep; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=x4LtonqYrT7G4qNBwEeK0f+06mohriAA55Pys8MWWx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RFc0Y/+7gCP40w3VzKraULCk+LFdE2ZViPUMHfM3Htxuz+ea83vUb71IZjgDX81Xf 9MlAufcUX87FstAU3jcUvOOcVLnc6qCyWPNi2ajgbSlLlhkUzSv+Dat4aDNPsGPn8S M0T0aB86+/HLQOVwocv6NcCaZfqlJK86A1cHfZKfU5F+hyi4XvQ9Be9t2CLejyGM8S l+dLb8Biyu0hsJcE33mzi0IT/DPLLv4Qa8cTeVwBsoGn6UhyVYNWbMpRY7Wha+hDwx EElfiHJlyzKjq3QlqAn97kFNbGngBrkOTyINa7TkPxihdeZZyTeRlMB88/a/0eHApS 4cTMvn9CM8qEA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Tianshu Qiu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 28/79] media: i2c: ak7375: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:18 +0200 Message-Id: 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/i2c/ak7375.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/media/i2c/ak7375.c b/drivers/media/i2c/ak7375.c index e1f94ee0f48f..40b1a4aa846c 100644 --- a/drivers/media/i2c/ak7375.c +++ b/drivers/media/i2c/ak7375.c @@ -87,15 +87,7 @@ static const struct v4l2_ctrl_ops ak7375_vcm_ctrl_ops = =3D { =20 static int ak7375_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int ret; - - ret =3D 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); } =20 static int ak7375_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519294; cv=none; d=zohomail.com; s=zohoarc; b=OBOOmbZl/trHYqUdhtUWRmhRpD3qBbn9gau3Rdpa8j7cRnqsQ1ScaPrC2mydR3EbPWvrYToBInG89MKI7Lkw1PNo2vf5n7iEmm3+thN003keSAmTnNVq5dDSaW+KBG78gadKLHZKO5MuX7+v9cEBxHhDe4wamZMda1lBSMhm+gA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519294; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TBqi5I8m8W12VTJAhfopvdehjd12gjfw2XGWAgPbfQA=; b=gUBR5qKBjeQbEToxCFHC4bow7XpQ1falO6UFvwxhkwBt6zgCg+xPvblTPadS5VQmTUgOWKWQgUttRF8/VBlX2kgRMfOp+9b5txxcOhML8sIbxulpB6lkVW7TDNxNqYDTaIkcmFXPspb8RkKTLmWsUwGteDvdMFUYVBNg/h2yHH4= 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 1619519294725933.1023712481532; Tue, 27 Apr 2021 03:28:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238219AbhD0K24 (ORCPT ); Tue, 27 Apr 2021 06:28:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235517AbhD0K2D (ORCPT ); Tue, 27 Apr 2021 06:28:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B303613D0; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0c-Gf; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=Brp5bgVOD7UqAef4tVuj+33Q8jgTwnd/UQoPNRzNrhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e6fyJt/1tyQ+bKXpDrQhcZ2T+6eCV2UdjdMUSlzUshM/+lUly7WUAndQ07uDq81c4 3BDo2YsAh9mlufH5zkddHpySwopBKA9CwmUfvK/IPLvO/8Ux03j3Fe3v1dJd3Hgqm8 1Zsw5WvJ4XAg1xQjDhzOd2aZVs4yvcxoYiT8q5bAewCKTsp+0wgfliR0TA7oMsxy4Y QvwvMxwjynnbek0QBSHJoA8zpXMOro/I7kJ/P2XrloADUpW8I8DRdDwWtnp+S/SbWb b5Z+H4wxqip4ikECiIgHW/T7hPTXN6f6DBwbu6cRbvtmuPtkhALg35NvY9QZsWCpnF k98sbx5cJ/Zng== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 29/79] media: i2c: ccs-core: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:19 +0200 Message-Id: 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/i2c/ccs/ccs-core.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-c= ore.c index b05f409014b2..8cce80557128 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -1880,12 +1880,11 @@ static int ccs_pm_get_init(struct ccs_sensor *senso= r) struct i2c_client *client =3D v4l2_get_subdevdata(&sensor->src->sd); int rval; =20 - rval =3D pm_runtime_get_sync(&client->dev); - if (rval < 0) { - pm_runtime_put_noidle(&client->dev); - + rval =3D pm_runtime_resume_and_get(&client->dev); + if (rval < 0) return rval; - } else if (!rval) { + + if (!rval) { rval =3D v4l2_ctrl_handler_setup(&sensor->pixel_array-> ctrl_handler); if (rval) @@ -3089,12 +3088,9 @@ static int __maybe_unused ccs_suspend(struct device = *dev) bool streaming =3D sensor->streaming; int rval; =20 - rval =3D pm_runtime_get_sync(dev); - if (rval < 0) { - pm_runtime_put_noidle(dev); - + rval =3D pm_runtime_resume_and_get(dev); + if (rval < 0) return rval; - } =20 if (sensor->streaming) ccs_stop_streaming(sensor); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519319; cv=none; d=zohomail.com; s=zohoarc; b=Vqmj9WRGfgvgy7+WRo6G26Pl41+HsVDJXYibY+DRwKogky4EeweKLlLKJYC/muPNFf+wumvf4FoUty+mnLnrDpIE+GV2/7qMsGrkh4WNipdm5PxaR+zkpHWSZJss3C9zLqCrWiYuCz6HR8u7QbbEDqcvpCo/rq7PLD0WuuhECqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519319; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iKrpLpKQ478eOCT2regos9g/o/iD40vxRMDO3EkRDd8=; b=anQ8k+pYLdtf/OPccl6q3+UbJka3DU1ZFCJs0Xc6eGK1k6xLdm7/NquxCV5M8uv2WnuJnCQ32Ll5pIIjVLPUWnIEoLLEBuSs6UwHK81RGeBemUAeYtcmVcTKJILnt+ZkCIgfTulr+wGSs15L1wDVIgPcOgsTqZ+T5u+xBoi4ZS0= 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 1619519319966255.08314427312905; Tue, 27 Apr 2021 03:28:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238340AbhD0K3K (ORCPT ); Tue, 27 Apr 2021 06:29:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235531AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 085A9613CA; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0f-IZ; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=yvRexqPmybCXcMQCunEHPJjJgD+ZEwM3R67ntrsgrMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPqcCYU/oaxqCKQiPkMz9uQCMi6R82hm51a3WZCBCpl4RD99A9YdYb8oIlaxbZQ9+ 5ocAMf1OlfwY28x74NNkCyFtMwM7/QTiPcrJ56+HUvD1U/Hb3YIDTv9qkoua6TrKpN fZHrDn08rtSVexkYNfc+VGR6o1bRSykUX1NStf3oAwAdU3xqT+NP1s40yf2aamXC9B xh103062laPXAPQQv7LROrauvnmIBrrbIePsw1KpHmZCWNuBIAvq98c+Yb7zlTvfoQ Bz/5cl0+0sZcOmCzbXoHQSmMva5fLRp6inl0dfvT2+aGqUg6HsIwmqKmNEUHOicFNX mYirX3q2BA5SQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 30/79] media: i2c: dw9714: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:20 +0200 Message-Id: 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/i2c/dw9714.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c index 3f0b082f863f..c8b4292512dc 100644 --- a/drivers/media/i2c/dw9714.c +++ b/drivers/media/i2c/dw9714.c @@ -85,15 +85,7 @@ static const struct v4l2_ctrl_ops dw9714_vcm_ctrl_ops = =3D { =20 static int dw9714_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int rval; - - rval =3D pm_runtime_get_sync(sd->dev); - if (rval < 0) { - pm_runtime_put_noidle(sd->dev); - return rval; - } - - return 0; + return pm_runtime_resume_and_get(sd->dev); } =20 static int dw9714_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519401; cv=none; d=zohomail.com; s=zohoarc; b=DHyz6yDdJmu8a6ySwOQtWI9CcZRWf20/GDymEk0xg69Jo0Pir2JtLcSnz2QpCfM9nM0LW9XLcY/lrapVb2JocwjX9ykp7AOVsy8PjV8omVOI3ifLcILzO5Sgv2rDlcXxvW2K8yvBUDoLrSB6fD5e+HBxsA7LOYmjG8ER/JkBP+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519401; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JKzJ9TFnOeoXIC6CtCHUYAEwiE+j7oMVAOexb8j5U3U=; b=TQ0wzdzHCYdBffTSwSgowGaoi9AXhPugzElYHdvWWc5IrbqP0jCo8kM82yfucO0CKxpGn/E6+uduCPWlMvlxiTu3Z1SmP+TJtBi5hstqViMytgb6FMF7H4Q6Ugcj5McZ39q56wFp2W33T1VCtv8XrvxHDU9MWHQn22Ss6V/BCbw= 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 1619519401176877.1040148862896; Tue, 27 Apr 2021 03:30:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238399AbhD0Kam (ORCPT ); Tue, 27 Apr 2021 06:30:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:48158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235620AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 659AF61402; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0i-KY; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=0+qUTNue9hnyAq3YJfJJPyrh70EsjiwzWG3y47ywjxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CG6OQuMRDw4aL2HhzULba78FW659ajYzPkJNTcHUqo287goY+/lJ3wQBhkvs2X5eV qpp6o/vZbM+/BzyQLcLujpLxk1gRqDGU3mpek3cYRVj+v/pkrktoIDZXaz2gscBFYU 5P2qxTopAlj2zc7c4DmRZIQ/OsEwaTXLcps8i+N1oo+8i8mA/diO315zfH8CLiH8z2 vDZGzJT3KiXtijUulAetuz4+NpzyDMt1OSJ3eZmjrrOTYB0zq+HhYXE7acR+QMOGcZ 8i3gmVMbmWEMN8knz+Fl6gGelGaxPU6EzE6p2sk1PbxCX1wcB6B3wM1g379vZ2qkk1 4xJQGRj1YURng== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dongchun Zhu , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 31/79] media: i2c: dw9768: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:21 +0200 Message-Id: <351643aad80075ea3bebcfa431479156d8b92ebf.1619519080.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/i2c/dw9768.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/media/i2c/dw9768.c b/drivers/media/i2c/dw9768.c index 8b8cb4b077b5..c086580efac7 100644 --- a/drivers/media/i2c/dw9768.c +++ b/drivers/media/i2c/dw9768.c @@ -374,15 +374,7 @@ static const struct v4l2_ctrl_ops dw9768_ctrl_ops =3D { =20 static int dw9768_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int ret; - - ret =3D 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); } =20 static int dw9768_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519690; cv=none; d=zohomail.com; s=zohoarc; b=afFpHCfHzqdzGczrpAvsjSjGL3+RfSdWXdPBJDP9ql8lAKYT/B6mgdTvFQqxKmCeNZMLSmOM7V5CXbiSY1/LMYfhYjhR/QrIH+L32E9OwfWl+J0t0df3KridUB/UyYBRND2dudbjCjhN6JBPHKiggd0YlG8spFMOqPYIrOWIFKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519690; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tWC98gV1RItDDbsDGxY/cuT3KZgUL732sUSdtE94n3E=; b=Car9bH5q5EkeSEiVZ8TYCao0/9iUZ5dQvIRqleDJ7gBVGVydfONvrjB5+s73ifovJIMAOCfk1ZtXenvPFMot29jkE30cBlrzfks+5S9iBgf2uf7XIZfAdgsFkFrbm5etJpbWCC9hoEDr65RdRHb+qqe8xourRnpL5KwZ89kanxA= 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 1619519690467588.838057693341; Tue, 27 Apr 2021 03:34:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238421AbhD0KeJ (ORCPT ); Tue, 27 Apr 2021 06:34:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238041AbhD0K2d (ORCPT ); Tue, 27 Apr 2021 06:28:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D40A56144F; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0l-MR; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=8oeNDL2f6ftikmJG74aEJuwd7JVkpDOtWW3l23y+D78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c41tK+hscMgweL5Tlc0xkZrqp+yUtOdrcR/Kg2lLf3eIS92zsZTGNnWf+tk6urkpk JrZ0t8aKAoHDk+srLB4vvpFJmwbcLnUC0kvHfzZRdBd35ZHOkWTbNg4FgXanjYAYCz RZlX9LnEcm3Fix01yMLebNo3/SqZtaGGn2ThLliJAi9TsedgkDXIqwRKO5c+JV8OCJ TJ2pGPlwQnGluhO+FUBgzJ6XYzuJCBcQi+WFYkNaLTrMNTTHsr867S15W7ZaxJvVeS jetPTi09m/tRgUmkUDa67Xi+tJW7am2MIq4lrYKh0EBw+Tjf5IkjzFA/FRy/UvojeZ Gi5TpPPVA+38w== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 32/79] media: i2c: dw9807-vcm: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:22 +0200 Message-Id: <601909851ba888278067e163ea0905b443869ccf.1619519080.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/i2c/dw9807-vcm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/media/i2c/dw9807-vcm.c b/drivers/media/i2c/dw9807-vcm.c index 438a44b76da8..95e06f13bc9e 100644 --- a/drivers/media/i2c/dw9807-vcm.c +++ b/drivers/media/i2c/dw9807-vcm.c @@ -130,15 +130,7 @@ static const struct v4l2_ctrl_ops dw9807_vcm_ctrl_ops = =3D { =20 static int dw9807_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int rval; - - rval =3D pm_runtime_get_sync(sd->dev); - if (rval < 0) { - pm_runtime_put_noidle(sd->dev); - return rval; - } - - return 0; + return pm_runtime_resume_and_get(sd->dev); } =20 static int dw9807_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519441; cv=none; d=zohomail.com; s=zohoarc; b=dX0e0LR6aujjDgAZULSMEN/JqQfQkva5hPNKF4t+jGqzFgDOCKbiCpxQZ/9URPhjTXGWyRCU8s6Es9BOz2xZud/cokq8XzOY/zSoEnPkXtJXTkSgFrdZPuA5ANGnH89FfVwD47rnP0PbKeVkrV82E2eCph7/7H6sS52lZkBKu7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519441; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s3kuLH8y4GZ9uTdxpO70S50hDV2GhzUqOOKJqkcOljQ=; b=CFzE7NKgQZxHWCUbfzvdA77qqSW+PDOJXWIhpAZG/aR8Gh+PvYxESbrW7CFWM2QI5RqyElKJQSUONgMba0KhjYD9bihcvgy5PAkXh8KndxxszzDe8f3jn6zjRSDsiLzLPQKzNuixVvzEcR9gFOJ3fX//dRofvBoIH+3JWNnCgcE= 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 1619519441239654.844997727448; Tue, 27 Apr 2021 03:30:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235715AbhD0KbW (ORCPT ); Tue, 27 Apr 2021 06:31:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235760AbhD0K2L (ORCPT ); Tue, 27 Apr 2021 06:28:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85C9861403; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0o-OL; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=28FtFakpR3rMJfq6Bb1gqJsNDZKdyp2sz2lduteJODo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qExp0FjGxpnACO9FE+WZ4p4ujgxUWvBJQFjsBQF9PfwZrt8LMRzT4PZo2gfG1jIwu 9CkbNT3pxVOmfhAW5zxySoZ+fU1ZwpQal9JTYMA9uOAe/DOjy5mK0LgN/WoPZAsJ+8 2gNl9EVI7jWEaf0qo0HujPNlmtiEjxO2f72OMtLad359YolUwZ46E+lqvttuAydLg8 np/Sx8jRVYYaMQKYfMY1U8rIMf2b5gqa/XCXa4maHNOHk8pReTs6g5v7KrgAy+pwzp btOkgdI4qD60efWfRJVK28nIebJnbZ8/cRDz/uW8RIC8c1YjWdYgwNmnnLr8Asa1Rd Ag2NR7tEeNGBw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Shawn Tu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 33/79] media: i2c: hi556: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:23 +0200 Message-Id: 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/i2c/hi556.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c index 6f05c1138e3b..627ccfa34835 100644 --- a/drivers/media/i2c/hi556.c +++ b/drivers/media/i2c/hi556.c @@ -813,9 +813,8 @@ static int hi556_set_stream(struct v4l2_subdev *sd, int= enable) =20 mutex_lock(&hi556->mutex); if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&hi556->mutex); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519291; cv=none; d=zohomail.com; s=zohoarc; b=ASYbHEfBpbmtY9i/i+EZD5W4YfaPKLTDFwxjCv8E1PY2A3NdEq97WoJq7xXuR15tKqIVvsdbiGLqd7fWKpVwo2rsHvh1RFv91wsVKabWl06NF40tNBwdV2+Z3pCKSDwhppEbOm25zKZLHNY3huuHhFqXpV3bQTV2BkTvO8bW26Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519291; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A+aXzeElgBgUI5AVlv3yHEkhge9yq5Wf4aRJehbm4xY=; b=OHbYkY20Sg1Sf4AFbeCGECR8DF4cOgWCIJc9Na6mr48RF8v5BZ/lXALAQUO25Cyxh905JpFrfX+b/VH5tEY2Lkd+Ug6D7AA4I+lcJ1r5d4t+PvBuQ/ESHW0QQr55+cXUc7IV/q5IkFw9I7JNxp+TOBFQFqlKN88hUrZtAsec4K0= 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 1619519291934213.38472801708667; Tue, 27 Apr 2021 03:28:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238199AbhD0K2w (ORCPT ); Tue, 27 Apr 2021 06:28:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:48150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235515AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0A60E613CF; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0r-QC; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=KnK+ScvrOSmF+XC/C/B4F8IBvu/svp7LsuDeKcM5sXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oCXST2Pummt1+FhYODqL/l+0TrYi8RnSKQBBEizPd4C029piR1++O0q+JCQH4n0uI E2a6FBsF5f/wa+VoAuZbTSOv5h2v2i4C2cY8H2jnz/aMGQx+AEh8rJ5sA60rlmzGdG betc9ZV/q6TmNVV5sW2lISVXPn7uCII2QQsAvxkLk/8vmTpNaS5yTW+Sg5nbOx5mFl pLTRMxjRPpJp+jr03Gf5OJbZaZpjs/zch5fE4MtSsV0r6687geNnjywpLOBmu7pi1v AYBlrmFeh8VpeeVPN+Bm1b0DQ9+XJATgka6gF8ScRI6k3rcPlfkBREJYRKvAyqh0Dd 3JA85avUSqkJA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Ricardo Ribalda , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 34/79] media: i2c: imx214: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:24 +0200 Message-Id: <75a90101d9e457be31869c404bdeaf0ab0cace8c.1619519080.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/i2c/imx214.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index e8b281e432e8..1a770a530cf5 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -776,11 +776,9 @@ static int imx214_s_stream(struct v4l2_subdev *subdev,= int enable) return 0; =20 if (enable) { - ret =3D pm_runtime_get_sync(imx214->dev); - if (ret < 0) { - pm_runtime_put_noidle(imx214->dev); + ret =3D pm_runtime_resume_and_get(imx214->dev); + if (ret < 0) return ret; - } =20 ret =3D imx214_start_streaming(imx214); if (ret < 0) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519575; cv=none; d=zohomail.com; s=zohoarc; b=BchREjXUgL1aiENTp0wc58vwS+CvKVCxs9XgVrXWkBH3pw8Q/lcMH6HAWRQrEM9W9LjxOyCc8z5m412F5cKyGs2l3AXXefLCmFkHYBMlNwaU6nVUEg/BX8z9XsYtfdLKIoAqXzEPvynI6c7AXpW+v7xkxDlKr+Wug5MmvBVmgho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519575; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z+CRtO6V8wkMfJ8tgSIMTmwEthZ08tL7kMK1jdCI+yA=; b=NveJqVD5YlNYaHYDjFNsWyMySIcVeuSUncjFYbm6iOxLWZoaM7zWrjZgXJBXvYmdbXhnp3l6vylQSRI7AjVLES5XKWtCiodSCoyEkiu1DJgCALeTFDvQDnH2mIzNyBFStSyOGAmiZ2Q6DRKePb7AVtCI0jHEGRFBh2lLB0sSADI= 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 1619519575795106.64561233991435; Tue, 27 Apr 2021 03:32:55 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238256AbhD0Kdg (ORCPT ); Tue, 27 Apr 2021 06:33:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:48278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237999AbhD0K2c (ORCPT ); Tue, 27 Apr 2021 06:28:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BFD3061443; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0u-S3; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=nPYpAR91E3rgdblnM1RIaAoqqFVi+fAvcFwJJ6A4j/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b0Nt8VqlPtaZy9yemo4qCkgWmuuP7AEJmdQPTgtLLoJ/84eCKQwHVhyfd+18d8XMi F0jMoCB9z982bvvJwdLzo6PYHORbcNsX17SQVArVUi0jo70cDp1XFBKzg4AKXy8mjA U5mVuR+nwTevQ2/PnlAuI8mErhAEpouttMCCJE8Hg6Mbq4QfFq6ZDgkdlLC9T8eIfA sbXiesKBInS5uLlO7pCzT1m2+nZw3GXtAK3HNxcC788xE01k+MF3rEkevSyisMWcOu XhiMztLj5SeWk9A0e8QG1Jd+aF3o2N40YC4O9LHzBHs46jxWwQEYUwKQBDeHMgIlb3 uzRfcMNx7n0Mw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dave Stevenson , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 35/79] media: i2c: imx219: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:25 +0200 Message-Id: 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/i2c/imx219.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 1054ffedaefd..74a0bf9b088b 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -1035,11 +1035,9 @@ static int imx219_start_streaming(struct imx219 *imx= 219) const struct imx219_reg_list *reg_list; int ret; =20 - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) return ret; - } =20 /* Apply default values of current mode */ reg_list =3D &imx219->mode->reg_list; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519273; cv=none; d=zohomail.com; s=zohoarc; b=Ow4O1/F7uoIMT98V2gIl2vwLCgTTXprxNa6Y3sOCsm/iBHxfyLeYsq/EXWcD53Kn7kb9JG0Oe6PCpQIw4gCdoaBjldYw3v05X8aVOXr9eIMxa5XxlFuWOl213Ro2Nzl68Yk5Qh6Pm2JGuWkBlPQh5MXXywCaRiYGdfhdCBY0dRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519273; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H8MaTp6hfkElAFLZeHHKfZ6ROHP18nT6aCohBEbVvGo=; b=RsarBnac09/GufOvndl7gj3sTv3SXECwDrU/OHho9j+qqQ9q0iQBXOxidykT5y8fTEvp+F54E5hwDhvl9M7XMqOg5PKXnuFUmwrliiDCaQI+fdl3ny7hYdaDY3k3AFkbC5Le4rqMaQOoqE0/+nLxnDGdH6NnTuxePTJtoFNs2p4= 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 161951927390274.91031533445857; Tue, 27 Apr 2021 03:27:53 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238050AbhD0K2f (ORCPT ); Tue, 27 Apr 2021 06:28:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235486AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 019B5613C5; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o0x-Tt; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=eHVLTLMHsH9CniLLDWRCODM0fRuiKeyCHa5RZsztWV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e8RlsyiNI1XktFOjf79d6zq4LYHZ5aQJV2v7egsNmkg2BtIcxlyPOZNbv1MrVFGvE yJST7LaW53M2WUyas/djhW0xboDOevQzTmTEJFdIOOuaDvljjC11Xfq5C+aizkR1HC Y8JjFTaHxHQz5T0FUx3ymdupbSLV1gholDEeN9OuXFPTVd+hWeFdy00I6p9rkqfa8M iB2odU1mtFIQGe9TrmNYQgv2vzinGSuywtcVDll8uITzFLo8CYVTTbddtwEphJzfYZ Id/t/QFcPeA8UmXXepaniD/aL2VCQ7PArYfqlDa0576nx4u9fr5Un09ILggRWmay6u aIWSnvxxpK0Zw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 36/79] media: i2c: imx258: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:26 +0200 Message-Id: <04e3ded737aa0c382385ff89239f0266dd72c70c.1619519080.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/i2c/imx258.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index a017ec4e0f50..90529424d5b6 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -1039,11 +1039,9 @@ static int imx258_set_stream(struct v4l2_subdev *sd,= int enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } =20 /* * Apply default & customized values --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519264; cv=none; d=zohomail.com; s=zohoarc; b=ijmKCrng6IIawmTHP47PVd/5lBapV/wxdQ9BSXznEy/SQvZuprOAvWHIWlsnNln4J+C9bEdsS9MLFESpCBObrsBm41y47ak9aQd1iiDZZdNMc2v1Ue3YUb+cVbkpMqbqH4JbOUIcVeOK2TRTLXLX+m6fb2wsj/mXmEFTWtSo24o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519264; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YY+9ySulXr3xOJiKlXEpT3t6C05wB27OdcqmX73YmsU=; b=kGN+TUDtPUfCgYjm9JU4zHTGsKdI1EY6NGH3xe0ShjLm0wgvIVWyj3Hz0OuFdmHAVMATfheuHDcbgg3CfG3+k5ddUht5yNPHvoA56Tn/zzgMm8dtzoqobF1MLEmUvwzEbeLXJmfSExKKZcnOBIJsUL26zt/vMQEIO+CbL92yX8E= 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 1619519264184293.0783141434616; Tue, 27 Apr 2021 03:27:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237670AbhD0K2Z (ORCPT ); Tue, 27 Apr 2021 06:28:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:48142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235463AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 08720613CB; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvw-000o10-Vt; Tue, 27 Apr 2021 12:27:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=RKkiGoCDSW3lMHxV9n7JS+4PruB0khbogVRD1m+DqBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rh7UNhtUAx9DvkfqWDmscO4c1CTa8By9KODzNVMesADrBSKvwVFxEue8V1q6c2LgX YBZOaPo/a7WmqeoB/8HXeNXoq294tJHKaKErH0EEbS60qDD5VB6uS5vled7+ieicUc 5Vu5vWoWacj93HXVzBiuQur6tU8YKpSKOQ1qekU9lcz9Hvin/iUNsqDA9oytO2SugD I4BteWVdqQ6BlIEbfz5u1ctBrQFqevnCTB9lWrTQCCgInNvyQEvR0RUoxVeoG0t6qU 5FjDOjaJ0RXmk+lV92QgNet70mPz/EaxGSOrOVBL9LpZs9LWvTLb89gDOT06QknFdp SZb+mUgcQhEtA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Leon Luo , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 37/79] media: i2c: imx274: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:27 +0200 Message-Id: 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/i2c/imx274.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index cdccaab3043a..ee2127436f0b 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -1441,9 +1441,8 @@ static int imx274_s_stream(struct v4l2_subdev *sd, in= t on) mutex_lock(&imx274->lock); =20 if (on) { - ret =3D pm_runtime_get_sync(&imx274->client->dev); + ret =3D pm_runtime_resume_and_get(&imx274->client->dev); if (ret < 0) { - pm_runtime_put_noidle(&imx274->client->dev); mutex_unlock(&imx274->lock); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519333; cv=none; d=zohomail.com; s=zohoarc; b=dJEqt6HmJzb/8GuPYw4B0K69Kg5DvME3NWL+gxNc0ZhL+Yp5R4684fEIyVZV8npL8MNji6Xn7Q45Jz8DLZWcZLTKkmlGb9pPfi4HzjqcvJFH8vR9xvpTfCK8bznFP1ZyiE1yaWffid8QgYAnPZTAQTK+dsAaCP7ZCpu211unJu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519333; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=47HdIqjUJtGUwQDpLtdDo2YUdcfQzgmDsHwVdQxtZ00=; b=PH+vP2Ly/Xyl9vgL/mDfjzbzm/h05+9lGdO5k5Zus33W0NifnntSEksuoMwpcoo8+53/v2jaW14BMWkdSpdk5h+zm1J/Cv5i7rO9LXwCdvlXK1YAqLTb4dtLQ0WITtqmVJDPbNPciGNH0bchOFyR9Z04W/lXYEJebFCcRt031E0= 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 1619519333352297.8625263934164; Tue, 27 Apr 2021 03:28:53 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238253AbhD0K3e (ORCPT ); Tue, 27 Apr 2021 06:29:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:48226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235555AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4BAAA613F5; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o13-1S; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=uVFbSBsOFTlNeqpthO6c96NJAUfPhbV6UvOttxV6+5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3qh6IDWSg3pJg1l/LlOM0a+ZuzFRnI+fTGlm6Tl57pO4vBJxeBKdnMygztYQH5cH 9hLLlNG/mTok2AAXFHG53RoJWXQM7bCoiMWIt/751hAd4tDQPGnEnfR+GhVUmjlWmB mtyD4kEV9vSZEz10ncor9cEa5imRycQjzV7NdeG1pgVWo+78tIPnwTYXXV1Bp9v3hM pHZpA4J4PqEK6/bSRuXg6psv8sSpetOXPRfcCSn0mFsWJ+L58DjCTDUlj6K/Kuz/Ka SJyNiHpRxOSq5wZpeIlvB6JQUi71Rfj6vIVFSSXhU/O7VKOK8SbsnjhEvRFYf18ORu znLVAeP+Y0ppg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Manivannan Sadhasivam , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 38/79] media: i2c: imx290: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:28 +0200 Message-Id: <08e787aa001053584b70710ef73911d955ac51ee.1619519080.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/i2c/imx290.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index 6319a42057d2..06020e648a97 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -764,11 +764,9 @@ static int imx290_set_stream(struct v4l2_subdev *sd, i= nt enable) int ret =3D 0; =20 if (enable) { - ret =3D pm_runtime_get_sync(imx290->dev); - if (ret < 0) { - pm_runtime_put_noidle(imx290->dev); + ret =3D pm_runtime_resume_and_get(imx290->dev); + if (ret < 0) goto unlock_and_return; - } =20 ret =3D imx290_start_streaming(imx290); if (ret) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519339; cv=none; d=zohomail.com; s=zohoarc; b=EwIfMksBCLpzUiXOf+Sc6h9XENGQ+n/co+6dEsaRXpgODdUb47qSh+9fh7BPmBrtHwX+EN3bdKOaXqc/AmjHPZUs08wNISbicoe4OKMatSgFjPIJN85jsvKL3APOACdmkUVpCV+ane1OPsbloRc7e/G+HmhLw6zw122h8GHP2wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519339; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dSOEoM10daHE4l7vWm5N/lgBLlAdUfkgG885M5nCQIs=; b=VEqZE42mjo64Gpta2roMUmVpHu9iXBxsPFQLb2sXW77MQ2bkvJjWvIGgGrXX4+ovDl0UiBhsLhQne5fE4alRb2uaojuL97FJiDOyDyHF/e8Cbc53ysnbOjhRi5j89J5iypM2Wodewhbnmr0MPlP+5iDl78S/NWkRxkWtoLnv6Gk= 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 1619519339465487.53071144484204; Tue, 27 Apr 2021 03:28:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238386AbhD0K3k (ORCPT ); Tue, 27 Apr 2021 06:29:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235577AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A9D2613F3; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o16-3N; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=6SWDMHkSlrYNzq7GtPd5DH9pbQJCAbHbxO2AKYAv8vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lOJDLPBxCl+9cAhbz+aARx6L2YI/w74aH7fhI5eE1HY1iVBkK82rOTZPJFsZQp3FG nbqmuE1bbJM9t1GPtrzS4SHGBd/U2qcXSJLSIV0SFKwddIt7lXCFVEy6XKTXZQDd6S CZU2KKcwGsAEZpAR+4Fw0H5bt/oEdYfWC8q82nk7MlE4ll74lHLsXAZTlpsjwtTm/n b0GudJZoiH7mLg2zS+Mt0laMYZ29BR1HWVl6rFKc2OWWYKXh7CUrTkjbEr2CM5ywCm vTQydNGN+zZ6vp7+UQk30DIoWOXSP6KMjtfqFH/oert9WR8SAgX4tE6CX9FgWWw4hX 47OWPBichWL3Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bingbu Cao , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 39/79] media: i2c: imx319: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:29 +0200 Message-Id: <0e4c8010910c04654f03304019343fa5d2a8bfef.1619519080.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/i2c/imx319.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx319.c b/drivers/media/i2c/imx319.c index 38540323a156..4e0a8c9d271f 100644 --- a/drivers/media/i2c/imx319.c +++ b/drivers/media/i2c/imx319.c @@ -2141,11 +2141,9 @@ static int imx319_set_stream(struct v4l2_subdev *sd,= int enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } =20 /* * Apply default & customized values --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519389; cv=none; d=zohomail.com; s=zohoarc; b=eK/lidsnMjnzTP/6+epdRPCY0xMrhMKCCGw9GxdKesKewlDUVPsc5esHG4jpW3GURGobeNnUhKBY4py5MPwA0Fgbp1kFFeunSctpOQaeieXUMMTZTLtb49VtjxDLEcODypHLsLT+ZTsDpEESrd1qPoJVuW+nhzl6qzHeqAfZdfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519389; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qRTMTvpczQKE+X3g27UzHLGlN/Kg7/wYaxpaH83PSm4=; b=nrWFoFbQUDZeH8hT69q5qwrO9P9UQUtA7+JbGGNj3N3ul+WovNWsAyMnLH3aG0twxzU7MadNgMenxgDFdgT7pefNdMGYkjNG7F8LnIJJd91/bBLoHcIdcZnzvsTmlgHb0hXbrtYRigP9oVxstwhO+qfA+m3Qt1g+mnX6wK72+Ps= 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 161951938954841.94859150692605; Tue, 27 Apr 2021 03:29:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238311AbhD0Kaa (ORCPT ); Tue, 27 Apr 2021 06:30:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235613AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5925E613FE; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o19-5J; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=Q0bHrDKjUOjsdiFC7y51wKhz9eviTnP6n0iV74l2LA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ONLvm551PXN4wdOfSePFx78XwTlfDQKJG71nnYWcye9pm0Dt33drJjYT04cJxL46C RRqRvqBeq40PuhlGiZXiAjWsSS3C8+vP682ozSZv2MLlzYxDcr7RkgDEshhxY6lfvU ue3lvil3AfJJbLjLdRiwr7TyKgRTLZtZUPhCZs9jphqkgj/k6ow6A67FVKvmWcw9hi oaOtCuotIBH59TuSRFhD75aYxw//6PnSB7YSDgavXLe1ALzG1tk4UTDzk7e2PlHi9r 2A2HDfHS9lcMo53z4XthDeABGNrH85oNlwF4/3t/QfcQ5b+Uwgkzlg7gbBs8rM6o0p Iwho8OjtWNNxw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Paul J. Murphy" , Daniele Alessandrelli , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 40/79] media: i2c: imx334: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:30 +0200 Message-Id: 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. Reviewed-by: Daniele Alessandrelli Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/imx334.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c index 047aa7658d21..a5a03bb4a6ae 100644 --- a/drivers/media/i2c/imx334.c +++ b/drivers/media/i2c/imx334.c @@ -717,9 +717,9 @@ static int imx334_set_stream(struct v4l2_subdev *sd, in= t enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(imx334->dev); + ret =3D pm_runtime_resume_and_get(imx334->dev); if (ret) - goto error_power_off; + goto error_unlock; =20 ret =3D imx334_start_streaming(imx334); if (ret) @@ -737,6 +737,7 @@ static int imx334_set_stream(struct v4l2_subdev *sd, in= t enable) =20 error_power_off: pm_runtime_put(imx334->dev); +error_unlock: mutex_unlock(&imx334->mutex); =20 return ret; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519415; cv=none; d=zohomail.com; s=zohoarc; b=kqQzt5L6nQ0sT+JKOWLSdtm3NemSNMzDLyyPkZTk1jFrGWv9q3xNMF0nfokIB4B/49dQ3e9MJrcab5aBgnUOwpdyK+qiNUPhtX/4ZMDciFT0rDzt1NwTHY/ZMg1yefkg/8hA1bjwyiIZdzyUmrRDwF012/dIcyluJtP4m6RFVuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519415; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YpAiC3VoZrOyX8YKDbWUeTgNv6/dnRzOTrP9Km56pVI=; b=RY6RFRVXpe7FB1vgT+BPMHDg7Q8yBTZmAm5GqA92IsOUyuJ/Rga6ixOFHUmnscBEAst5jsUb5Bm7ilt9m/FkV4mEZwqgPFhmewTvC5Dd0TWGPST7Lvi2sI+MX6DcpkOV+8uXQS8aDbDn0Yzz/5K+/gS8LOqj1Rk0OZ1yPnjLf/Y= 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 1619519414988443.00831843002493; Tue, 27 Apr 2021 03:30:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238135AbhD0Ka4 (ORCPT ); Tue, 27 Apr 2021 06:30:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235723AbhD0K2I (ORCPT ); Tue, 27 Apr 2021 06:28:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48B8C613F1; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1C-79; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=M+G2FGvpxz8oVs70Hd7XJ+D2QZDVSmESzfk8hhosPRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CKlqZvDyaB/aKwcH9tqr8QITL4MgPggJM1eUv2VKJ3gZA3kkO+mqyZEIrhRAT6hAK rvcZp5gxNbgD/eFSDcpX69018veu3jKHqkB/T/gme6jDJjNtJ2PC0tuVzdhnsHawLf 9KNivWDboLSJxeYkKjmDkq7VPlgFhaNs+se3nBaXADExWcWcnmqYQeyvkev+LlZMf3 QZckEG6YcEc4wzGo0+LXLNPkg6oZhWVFX4HlIhUUNVDRjhOXH2ZnwihXEIUgbMXy1B A47BrsWp7pHHUfTC6T+sUPPB4tFZL3HBBL3xRZfPsekoSoMUtH2VX87Pbw7OkfOnTB 1Co/44yF7/vrA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Tianshu Qiu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 41/79] media: i2c: imx355: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:31 +0200 Message-Id: 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/i2c/imx355.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx355.c b/drivers/media/i2c/imx355.c index ccedcd4c520a..93f13a04439a 100644 --- a/drivers/media/i2c/imx355.c +++ b/drivers/media/i2c/imx355.c @@ -1442,11 +1442,9 @@ static int imx355_set_stream(struct v4l2_subdev *sd,= int enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } =20 /* * Apply default & customized values --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519506; cv=none; d=zohomail.com; s=zohoarc; b=hGX2tTkfssgvg2dL4K72JHZyVlU7sFszVdaXdzhif3YAqYxxcY/Kw4LP3/0Yp9qlJcsY46HwkfFYukrWtPxwGdGUhkxAVlC5nLRPmjueMOFQxiXEaTqKdwMHZL5a8JA/Pozh9KJVwTpXANoNhi0rk4+DOMaynBTxQDqubkb8RRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519506; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zq3e8bXLEWKdpdBHiwZ9E5pnO/fJVo9rBE4LqYGvQVk=; b=iS/+zbbb51bUFd7ICP6lopaiPNQmC8GusQbl2IRPWm5qM4skZGrWIGQtBbbNGx5SpaCfNMOrTT2ivkMuw33TpKorZuqu5extBIFw6ySG3tU05p74QvXJmYO48Kw4I86TY54rbzPa1I+1fkzwaBI0hrT7dV0+WUzgFcuueDIVin0= 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 1619519506805904.7340824873672; Tue, 27 Apr 2021 03:31:46 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235814AbhD0Kc2 (ORCPT ); Tue, 27 Apr 2021 06:32:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:48142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237122AbhD0K2S (ORCPT ); Tue, 27 Apr 2021 06:28:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6FFDF6140B; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1F-97; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=3LPMYGviydz+wxD+uX1CWPHMq2PRxZGRtXrIww4fEeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfYMlpLkTE+a+U7DACSe3kqv79r4hpskaJ8xWggG5CTE731TOPRasVs5/XqeSjNuq 6pYjqA1qoaNCY8KCYavQsd5lDEJWqfkq63Nnd8wERXWS6oupupuIp4lhLZUBQpdE6r N3jbGIJMAmN1nKIUNWQS6WVvhhFtNp2aZTpjJgEl5XPoT0KT5Tjze8mlOZYz6YPCUf aVrS5hqV/Dp3+eL/zi56LrCA1CyRpRsKUlaHlZR2ScGgmxXtf+EmBPgK5ey8Kh8wnK CHqS3wnp9XnXF7vPTWtS9rIgULno9+59Bh+TPTJ0zTcTQuvo3qt1oXC695RrkQP+3a 89rBlsrR6RR/g== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Hans Verkuil , Jacopo Mondi , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 42/79] media: i2c: mt9m001: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:32 +0200 Message-Id: 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/i2c/mt9m001.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c index ac1b380e6c03..2867f64e357d 100644 --- a/drivers/media/i2c/mt9m001.c +++ b/drivers/media/i2c/mt9m001.c @@ -217,9 +217,9 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int= enable) goto done; =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) - goto put_unlock; + goto unlock; =20 ret =3D mt9m001_apply_selection(sd); if (ret) @@ -247,6 +247,7 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int= enable) =20 put_unlock: pm_runtime_put(&client->dev); +unlock: mutex_unlock(&mt9m001->mutex); =20 return ret; --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519425; cv=none; d=zohomail.com; s=zohoarc; b=XShvppfUXZE0cBwoNF83dcvjwL876eJcFKN6fpPhOR9QbcMvD7rG4eZ7CrdMi5V1W3FJm6+15KmRWTcJ9VDsGkt14ge9de4/hiYDPRRo4W0UlbLUez63O6MS9mGMHjbtQZm8inrDiwsCD4mujb1aWyQee1I22qWPKxXThrf5/5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519425; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ePRQI2425MZQs32erSgY9grVnVeMgLTf/dJ0ynteMeg=; b=cNbzInMEMSzE4BfuOp0QbQqDXrfXri1s2XJAGmjZ1UUT3cM4Phe2Eg58cXv3zb5NfIDPU3QjvZvdnaS1JP+TuHSrmOeVmWlecNIBdogyNGPo2EyAmuoN957oa8VS4t/J0BxFM1c/GTWSdc2cSWEc6TvTWug+MklRyiZraQQuSDA= 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 1619519425049914.6753026305254; Tue, 27 Apr 2021 03:30:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238553AbhD0KbD (ORCPT ); Tue, 27 Apr 2021 06:31:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235729AbhD0K2J (ORCPT ); Tue, 27 Apr 2021 06:28:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6B784613E5; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1I-B1; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=rXQEV5ur3+5U6VOB8wAB6dlcXqNLqRBsrKFm5rfs1io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TDWEHSoiJqHs+CXnKEzA0b8240R9e7+E5MwttfdXgkUfu4ckV4MTuYOUopf6dbCUO 57AO1wormtn9rpGhh26NDa3mpubctsWkq5n9PlCftz/Jm34XtgCdeeEbwYUF6szTBe OSVCrXvbLEB6KeAfd+ZMQtltpJbNi9CDFWgTR07+0DeRsuXbGORG8KXul+QRnPih9r vtp6XfekRVt7r6Eh1+gEA56Ysd1W7aCiNfNDbd8wVauvnd8g4bDq7ig/P8DLzgvM+R 7EYC2NXzU1p5I+a+B+9/+Af95BHT6Y/AUhfRSqBc4xwd6hr2chJACrHuG/JFQBUD2V rD0WiGx6/xExA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dongchun Zhu , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 43/79] media: i2c: ov02a10: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:33 +0200 Message-Id: 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/i2c/ov02a10.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov02a10.c b/drivers/media/i2c/ov02a10.c index c47b1d45d8fd..a1d7314b20a9 100644 --- a/drivers/media/i2c/ov02a10.c +++ b/drivers/media/i2c/ov02a10.c @@ -540,11 +540,9 @@ static int ov02a10_s_stream(struct v4l2_subdev *sd, in= t on) } =20 if (on) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto unlock_and_return; - } =20 ret =3D __ov02a10_start_stream(ov02a10); if (ret) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519255; cv=none; d=zohomail.com; s=zohoarc; b=nKt97PIwrd882WkF7JV842ebh4ejjvaAht9lnM5XVa8fqo/XfEab73naBLFVMXTUqvLXfT7+p3uHs8LSSrR3cydCOJZ0TdsnTXcuamiJNnCrWftPuH7QomOWIdv1/67EGzN+FKS1BrJpovdkUtqP78deGpjNRxxgJrmf3w1fDMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519255; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wXGOUkYOOE8eDy0arBScgP/6QM6Zj39A0sC7rb/tn78=; b=c1w4Q7tFQb8bbQXm2jEhaWq3ThcnRxoCj6N/zw9kATkI9Sm09BzGgY808frZJmOB34VPZ5ikox5dTlKAaZI2JxBXxwbd3xHQsjwtTXZzwh1LOj3RBz0rMX/godbDyPhtpHAdmaNrE7tEfK5yi6RIZ/9PgW/cCabkZ4bpsVHRdjw= 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 1619519255226627.5932089637262; Tue, 27 Apr 2021 03:27:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235423AbhD0K2O (ORCPT ); Tue, 27 Apr 2021 06:28:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:47776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235372AbhD0K17 (ORCPT ); Tue, 27 Apr 2021 06:27:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC675613C3; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1L-Cq; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=cJU/MoL9RhqbU2INYkiDGdONljhoe6cy+RDqPfC2nLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qKyPAg+L9jydgdJExnqviwybORcKu++MgkXDF6vU8hl4oJf8lHDcHKq8Z46M9XNkK 7z0lY6LwCFVzKvH8CjFNPgGl8blzyTmt5QM2ZkDNj8Mffs92orv4YA5/wkjuGnYwyb fCN+2Q6G0rJiYt+/1/x11Wny1TVxsuLmGqb772VvdRP1EYpMuQ5pRAQr7Psc4Ti6Bw LsgRaZrTMKgO+ssXZfN9Mi6HTFlh5gwsO/jr27zn6HM0Ia0RAEWej19JHGSRNLOyvR uY9/l/WA6Dn/pcSrlujL8VPuw8TA7rfCeeBGBxDkkNigGa02noa9bD74E8VdH0VH42 myKziTQR7lDSw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 44/79] media: i2c: ov13858: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:34 +0200 Message-Id: <32de6ac2a1ae6f62f38ee22e606af0990b3f2d24.1619519080.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/i2c/ov13858.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c index 4a2885ff0cbe..9598c0b19603 100644 --- a/drivers/media/i2c/ov13858.c +++ b/drivers/media/i2c/ov13858.c @@ -1472,11 +1472,9 @@ static int ov13858_set_stream(struct v4l2_subdev *sd= , int enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } =20 /* * Apply default & customized values --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519242; cv=none; d=zohomail.com; s=zohoarc; b=dFUMWp7yGxb3Ach7SRJLAThZAyTHqEExZnLu777UbCMhBUOnvrJRHnnzxljbKFW2kINpmqppK34N5Ge7F4NkY1QTGV2HHN7eMGQrQv/VBUHUAVroMXFbBiyfHPWcYTAAO4tzA+6A6RqRJyU9dxCtRtmp+ZPMXpfu2eRdXRCrJLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519242; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FUXGiP5elyNZViYa2pp2JXT6cowU6SRNrK0rxnYX9TU=; b=Gv4StLo4FEVxnEZAimd1xxFW/er3vcC2uifiExfTkFq4A2p7DRXu1pwKIDSIsxwH+Ed3cy8vEbzJsqlOslX2+50bxiQQxMGvCsZ43gedAXagQeb7oNvXpDdWdW0vjjrCXuFM/mJ3rnKolick+NWRadvzXeMAHX1PfgH92rD2bb4= 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 1619519242829148.165301768007; Tue, 27 Apr 2021 03:27:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235558AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:47650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbhD0K17 (ORCPT ); Tue, 27 Apr 2021 06:27:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1CB0610FA; Tue, 27 Apr 2021 10:27:15 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1O-Ee; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519235; bh=YsKm6VExyywU3b8QQMpE5e+1XH7hFzOYFX2Hhhvq5XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/jSXaeignl5yQptqhqn6VFiVIyxAcohR9PcwKFr49o5PfzpcVyfoZ9Dk4RIYzLrD +4KNqMpJJtVsxeB2hQ+SQBi2GuYYoobs6t7ofORvrvIQ6fxgFk8p/+dO2Z/T0hjkLE LSTBiYAk8pdIZ5D83wHg53iuZLgHEMvCA2tsCMO11lZKQTThqzqzynTDcsCh5oQsyp fhpqFQZhhUf4V7OTPCZIJKYH8l29Er78iUGNc7nRWQskaKA73QLFVSSRYa5qIHXt6p ibXygGUxh/ZxlX/GDaFQrC/J4zsymW3NEtPUJi6lIbVsfK4WdhdxLQ9cufpSMFXr6e doL2c+hplSkPQ== 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 v3 45/79] media: i2c: ov2659: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:35 +0200 Message-Id: <8a210791fe9934553e17fa87f7dda955c6c2a03f.1619519080.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/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, i= nt on) goto unlock; } =20 - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto unlock; - } =20 ret =3D ov2659_init(sd, 0); if (!ret) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519296; cv=none; d=zohomail.com; s=zohoarc; b=Anoo4DuZd/imDKZswdWKNWw3SueU8l1SJBYb2rbYYzNWUUS79zOt6/FL7TdsM9fr6e3ukiSTRPu/WHBSDLieDewFiwL89jWtg2CQQDU8+GH16T1svobShpegHPmUTec/8UEGMMepd9ndlQb/uB+ccMUPiXBkrI/P1pFDHtwGFIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519296; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CYi1XA99pht57BbyNfgi9eGyD3etRYWVPM/dlArIQpI=; b=hOK1NRxN03N31VmLfa4PndyTCahSR06G6grAQIww5cROgLYs/CJhn+W3ZjPCUW+Cx9102V/dKzrFX/f7MURyXB8XpZOc5mpCkcJ1JFhtLgJ7BWXcAwSfhhWv7BpE+yHjTGIPb9cHRDesrS5gbqSy1oideBJ4b0RAug1KUmz9lvY= 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 1619519296734814.4755542004606; Tue, 27 Apr 2021 03:28:16 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238250AbhD0K26 (ORCPT ); Tue, 27 Apr 2021 06:28:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:48158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235516AbhD0K2D (ORCPT ); Tue, 27 Apr 2021 06:28:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 10EFF613D3; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1R-GX; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=zHjujpboN+Iu7V2XpqIB+1lLAb+rrUx5c1q69NYA2sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpUk7OdXgYMc5IxFKVspOY/n9g+I4nUGSMey5qsa3wWEc559DrPtBbsm+K8r+Hbk/ WF42f0JmmdMZe5XVH6ol6VtSjiiLkPDp+AKyZsb4MiCE8V4rCH2gSdp8d5YBciIPuT q40QSgiqtReZx3wkywWmbWetKfJuhBctr8DLcqgjhlOn+0m8jdzvzsKanbPSJUYw65 sQG50kUWkFLmiBHMzPS4nMFkfmXhooeAmX/2Mrz/6bH5YJnV02vaHnGhZGbpCaJ6SU VSOyvgYJTZ05UyNN3F3JWQt3RKZPymhLB3mcOwO5IXB9I3tvuh6JFtofihkUVzCEKw oLgd7M14fh0Yw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Shunqian Zheng , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 46/79] media: i2c: ov2685: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:36 +0200 Message-Id: <4cb7f925cb309c2e3bbb8e10d96b3faf9c62d54d.1619519080.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/i2c/ov2685.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c index 49a2dcedb347..2f3836dd8eed 100644 --- a/drivers/media/i2c/ov2685.c +++ b/drivers/media/i2c/ov2685.c @@ -456,11 +456,10 @@ static int ov2685_s_stream(struct v4l2_subdev *sd, in= t on) goto unlock_and_return; =20 if (on) { - ret =3D pm_runtime_get_sync(&ov2685->client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&ov2685->client->dev); + if (ret < 0) goto unlock_and_return; - } + ret =3D __v4l2_ctrl_handler_setup(&ov2685->ctrl_handler); if (ret) { pm_runtime_put(&client->dev); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519471; cv=none; d=zohomail.com; s=zohoarc; b=TXth1NSKGp65TXK7c9DzadI97P7gotJB+WU+qNVj5Ku88wFTU/abP8LP1WNfANg/mIhasEqQ1GIBXsBGlrwJ1uq/FAHmj4+oyF03b/jzdCYNCzfRF3E9Gjlb7dPhLLqKX+y2jSyL3mrSvTUpvxOkm0ahKupK+3dZTHIExh6XvqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519471; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A45CkqqwXiMssRiDvxGPz8/2IGljJpEqOiq+R6IZ990=; b=j4bq3GD2TC3qkthg2ibIaZAC7L85Dhmji/jjXw1/h4FbBRar9ASFcXZ9yXbDofQcL49WWNWlXTEGJepKb3VHcAbKGMz99XkrchgXz1u1OhRVn0gsrCVq8M5abxYUEedFqXpEeE99niaybDwLakMb5CFI7qYa0Q63RhwtjrwJIfo= 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 161951947104211.36274650956534; Tue, 27 Apr 2021 03:31:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238539AbhD0Kbx (ORCPT ); Tue, 27 Apr 2021 06:31:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235769AbhD0K2M (ORCPT ); Tue, 27 Apr 2021 06:28:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BF4161404; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1U-Ib; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=umqdpGp1oSGyna8Ojn3AGfbapFLyE4ZVzg1c+rmxXd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KCiV1PbCI9tqPf+ESysh50sD/ZfeO4tgOQVcDzYxe/TZ3TwZrjh4pzIlg0RVGfXpj yXkx4wsZ3Tv15FHs6m6JkjF/8bIuUZ4pri6b5IoF+6IPjbmRygndCU69LcnvCAieML 1DCSOcdb/7SRIKt53etmKf++okaqv3tUowLoF2PfoH+Eg6iFPK96IIaUzpU6UDseph rxXnCW9beXrxBqb7l1AuiBCcm+/q27m4RC3PVHN/ZaDjsjrAZOE2d4EqP9ncb5sYzN /s/0RB4tEGXfkj41XUDhzWBagKhH53kdLMhiHzZPKrLRAqONoPzES7TagWdaReyI/6 fIG30dhI5FU+Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bingbu Cao , Mauro Carvalho Chehab , Shawn Tu , Tianshu Qiu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 47/79] media: i2c: ov2740: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:37 +0200 Message-Id: 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/i2c/ov2740.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov2740.c b/drivers/media/i2c/ov2740.c index 0f3f17f3c426..54779f720f9d 100644 --- a/drivers/media/i2c/ov2740.c +++ b/drivers/media/i2c/ov2740.c @@ -751,9 +751,8 @@ static int ov2740_set_stream(struct v4l2_subdev *sd, in= t enable) =20 mutex_lock(&ov2740->mutex); if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&ov2740->mutex); return ret; } @@ -1049,9 +1048,8 @@ static int ov2740_nvmem_read(void *priv, unsigned int= off, void *val, goto exit; } =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) { - pm_runtime_put_noidle(dev); goto exit; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519343; cv=none; d=zohomail.com; s=zohoarc; b=FWiHOb/uev+RfJmUGsbPncN30uUDrxFHTBbiyICN8kvmqmuW2vxpi6lKgOFB5AX4i04Wm9Fk2uF9hILXNYwIqSwpWxrUzBFHK8HEgA0NiDt/uZjQWf1j3fLfMyb9Qg086rtAZWEV8GYGqZjQkz3zURvB8ZH2Of5+cBFl4sBrRw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519343; 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=EdHrqzf09ikn6WRTP3LWc7JFgCc6lpPov+RTt2iBxIzEdc0IRQlzC0BmFry3DC/rfRhgHYzcIhC9sttxrzI3YhNb3+LG8iw3FXmTs/CcvWKaLHx/xVWRM8OTz27rTVhhaYGRpW0ou6Y+UTBRstvzNkaOYw4jegarFYZ8gwsM/vo= 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 1619519343739927.2635713969278; Tue, 27 Apr 2021 03:29:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235425AbhD0K3p (ORCPT ); Tue, 27 Apr 2021 06:29:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:48246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235582AbhD0K2E (ORCPT ); Tue, 27 Apr 2021 06:28:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 18BF7613D9; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1X-KW; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=5KztMjooOddzA79l4hTCyOZrgNAAq7qVnwZ9IgWgZxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o2IjPw+O3RDCDfvINsuAAjUbKtlFB8bHYrOcfddQjtwJeT39uZy5fD2m805/5P1op FvdgScUKEFYEBlkmmx9YoEgofu5QilzgXndyzVIhRKz90jWXJ4mu8yVSNpx8ASgtRP mNebCgq9nAJzZCdl7Gp5XNb02G4yM2BKVJ7rR1eL13jvNNIzQokrltPUCXAu5Qnyf0 jQ9NkDAR4Nk+BbZJXTw3w1OO5wnVIf9FrhnyrqiCxHr+tTcQC7MjU3Q8iEP2SmcAM2 +2XqC2uhbCo8cRvQpfBYGaFTWjG0tM4HHjCiFt4w6zwKzBlQOGProuXqmNUEk0Q1pq btHrLtKKARIiw== 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 v3 48/79] media: i2c: ov5647: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:38 +0200 Message-Id: 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 From nobody Fri May 9 23:02:07 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=1619519692; cv=none; d=zohomail.com; s=zohoarc; b=ZyAaq/9d99Dx+rW38SXNBqmm91fWcF289V9xWb3vQjEviS+1JGzm1SH0UWCBo8KSecL3QWUlBnax9l2alwiDjfDGFiyN2ypwFZWaNsDKRcfTfAfLSTmDFBEUtQrN8C1yrCyjRK/6VmgBnjl89kAfoHZi149OYoVR0GSCpzl/1mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519692; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U/NVyEVih0UeGt0TmV5NFxCGP5Of8yJI8psCw8wRc04=; b=FMfLVP0S+wN6OL5bItF+M7PRiRRRwltUCHUkxjMWbCBGy5ihgPKoIzRK6GrLCSMfP9phvbodqDTpogwG0v9DmN8JsQa8R1T0F5ZQGYYtYp1OXzItp3lJedm26+svHXEznoVgEwsfIUsL1tCxyw+bBO8o9D6//TgpJFVVDBALwjM= 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 1619519692748693.2722088127157; Tue, 27 Apr 2021 03:34:52 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238780AbhD0KeM (ORCPT ); Tue, 27 Apr 2021 06:34:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:48142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238097AbhD0K2l (ORCPT ); Tue, 27 Apr 2021 06:28:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFCD56146D; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1a-MU; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=30FDfGkSRFbi6myOhgI3rDKaVJ2tBblGkl0/ENBmv/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W/nE9OxUxQO1HPm1jhW61+Z+2fB25zsHJtYTLioom8ILqALFEfbe+HWGkf0Gj59jB RROg5XouIXPna36pijmYvh/f0s2SJIeln1JJ+FmPErcIa54u+3mDlp8ZiWWQTmE+OX n/8UkmOHTtqkzze/MR763Pn+PdiJgUJFPMUlR1Ld9kCSzUY7g3pV2vbDktObHcrHBL LTWiSB+UrIfJ2MtnU3loZhp7qtsuoB3Zp9hbwl4FwRooW4TcGwDZeLK6Qwv/dliOIE 8WwZj4g2dDuyatpJDCWR9/hKpW9SGnI1xReH8RrJeTWTZ0myoSprud5PaWNtOauiqc UnFTU8t31sG3w== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Colin Ian King , Dan Carpenter , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 49/79] media: i2c: ov5648: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:39 +0200 Message-Id: <07c979d8e29593ef17b135562d68dc2ff67aca02.1619519080.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/i2c/ov5648.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5648.c b/drivers/media/i2c/ov5648.c index 3ecb4a3e8773..07e64ff0be3f 100644 --- a/drivers/media/i2c/ov5648.c +++ b/drivers/media/i2c/ov5648.c @@ -2132,11 +2132,9 @@ static int ov5648_s_stream(struct v4l2_subdev *subde= v, int enable) int ret; =20 if (enable) { - ret =3D pm_runtime_get_sync(sensor->dev); - if (ret < 0) { - pm_runtime_put_noidle(sensor->dev); + ret =3D pm_runtime_resume_and_get(sensor->dev); + if (ret < 0) return ret; - } } =20 mutex_lock(&sensor->mutex); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519287; cv=none; d=zohomail.com; s=zohoarc; b=VZTG2/Wg+4Nq/nl3xpXby/6241bn5dcdlewLPjt4KmtTRXwpvhgy+VFqcL50Fut7/3O7vYRAdqI6Pp/X7tNoE1DL4WcMk8AEHqdjbaIE/BoP54XmUpZnRKSZcivHm07WlYKQjk8+mScov9RnktJJDKQrfE42qUGt6NGIZ1io7XQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519287; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PD6DG6VZVaotaBLhBWsDt9p4T7qsx5FB+3z2MjCLIls=; b=e8bOh5DCWPU/misLk2f8W0iV7ImOE4+lgnD/IQXOYH48/y6z2mVM8LYsJiseYXDEK+cn1knZIAHr6nqXUAlMfMYWVuTDyI5pB7zRCW92zPuKEIvCSCogiaAababdK32Fs/dXP+rYpiKKBPTGqplykFngiZ3a+qkMNquw1U9lvvM= 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 16195192875176.832272093995016; Tue, 27 Apr 2021 03:28:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238165AbhD0K2p (ORCPT ); Tue, 27 Apr 2021 06:28:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:48152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235504AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 177D6613D8; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1d-OO; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=k96A/wu5csXQdkebmEvDXUWzQhtBwXxGUFyh7/8ot0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oUUSSjsfuRam55BLoj7etPrAHWOSjJDjKNlzFsg5DVsMsq1vllx5g/SgWn+QTVCvA b1Fj0LGWAipwnWg2pfqZHVgsi0bA4yqPYpXrbN6ZAc+WTPZfxVdJrwA7DdroyuY7Az AfQoGvcDIHsKZEXLXNVbPbKxKpObFe0tfmd+UVY0NvEVaC+SDQq4Pbec1GhyjUL/3m g86gRnEa5qKxWmtLLz3d3cJJARXKAVM6qvF/Azb4zVUzvIzO1g+6gS9kt5QZLk3RuF Cg28vMODFvMO06p42Adg7/NKDhp5nhpnInMi8UtgKysDJtyZUW3efSAJYsF4woCMuV oGNzH13YZFOmA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Chiranjeevi Rapolu , Hyungwoo Yang , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 50/79] media: i2c: ov5670: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:40 +0200 Message-Id: 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/i2c/ov5670.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c index dee7df8dd100..182f271f118f 100644 --- a/drivers/media/i2c/ov5670.c +++ b/drivers/media/i2c/ov5670.c @@ -2347,11 +2347,9 @@ static int ov5670_set_stream(struct v4l2_subdev *sd,= int enable) goto unlock_and_return; =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto unlock_and_return; - } =20 ret =3D ov5670_start_streaming(ov5670); if (ret) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519404; cv=none; d=zohomail.com; s=zohoarc; b=Vzdld8inKhLM5XQ+GudfzrAeSioAmVYcoRb/lnxslTj/7XFa8jXcF0QbqdEI/zPxaMWtrPKUpw+tKcRTuKGhacyBgxybTv5rSzPB1W7n9pxVajB0wgPZptIRhIM2M2y29YGWgL2VwdQMUcvdYejiMxnFS640KP1sT2yNIQHg5Vg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519404; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y2oOs6MmQvknIQx2AD2cQVCBb5wEGO20mgwI9foNgCU=; b=bIS4jwsxK57K4ck6dqAkw0DifHGOyX07rU3yaIEUWd21SYcjgqrzWyfN51vVUSJZZFdyv+JC99NcQdMFAYyeYyQxJRg8awUICdhgrFxEbwRaJIXvw+gt1XJPqfqaZ6NlG3dbsATogiQEnr++1zKQAEh1vzeUvqNjHEylKPNWj6w= 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 1619519404225899.832237727996; Tue, 27 Apr 2021 03:30:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238525AbhD0Kaq (ORCPT ); Tue, 27 Apr 2021 06:30:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:48288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235655AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 42828613E6; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1g-QD; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=kwIJFx+3BZT7CutnecuzIxhgs2GnXNtjRI6MBhWOcG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=enG4hi9/yztR+ob4i0qWRCY8jG/MkPSN5Yy27gB2Ufz1t6DlfhJsdEoXYcPGMY1YH xAOwcUey9MUvD7lbVPpcF7uw8WJAOgIl0vxuRnl2VehpELa2HDSSYA+oqFhD3ZkWLw DQssdZEjlMcif8s8WCW1W+nFQe40myImi+87BHGMiTfV49v2VZs42OGrnkF7OgvSWh F/d5Ls3QdyYr01asZEFrgf3KpPE2UEH1O/CeInNeBt0jw9rEHjov77agl84aaeT7QS I17lSfoHxmMekAPWeK6Yt+s92GXHscmhGAlv3yzRWVIsSPKdTIFvICXQ4X0cfmU6i7 dTlzjBOgKyCbQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Shawn Tu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 51/79] media: i2c: ov5675: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:41 +0200 Message-Id: <88d5dfe2889416c3b17a73fd601b743e63b20918.1619519080.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/i2c/ov5675.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c index dea32859459a..e7e297a23960 100644 --- a/drivers/media/i2c/ov5675.c +++ b/drivers/media/i2c/ov5675.c @@ -863,9 +863,8 @@ static int ov5675_set_stream(struct v4l2_subdev *sd, in= t enable) =20 mutex_lock(&ov5675->mutex); if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&ov5675->mutex); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519397; cv=none; d=zohomail.com; s=zohoarc; b=EWW/oOqwvihhlGVJKvDOA60H5TMHCUHO1ODeltLh3vylXwZ2z3GnXjtru//cDaWZcRvUxzwRbAiS6g1pj1g9bf9281hzNS6zl+ezSnWhnXlmkVrSK13oGCePhXUm06gpQsQrLoUj8Fpji/WMD/MJWEc4rPQKKv/8VWLPzyP/ogY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519397; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KkORK53gtpg5nHI4GD7CeMZAQMpKY7HMfjApxsjIT+g=; b=JSY57RySZravDWoFNhQTZk1P0+7/2rI0NX0sLs8gcdcSkLCe1uVDVSRaORfceE/otXOzVvpxUGkiPuYzCKWOL3/OhURpDlcTWGysQbJcjOhHbTNSzGAGDb1f/Ujtvo2BTPCr3loMEXGOzF71OjZEG9lflNPp7jD5IMiuwvbDtno= 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 1619519397511175.5088589195443; Tue, 27 Apr 2021 03:29:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238071AbhD0Kaf (ORCPT ); Tue, 27 Apr 2021 06:30:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:48172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235621AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 57C9A613F9; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1j-S8; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=9V28x/0yZtyv8nyV8uH7fSioPt4mARji1tVhL7JUs2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CiUY3nJzfV3j0iV6EFclfxWEAThSe4t5YuwQ8FY9KB4/bxquN6WnmeciyH5t/NXOd XYf/Dyb5T9eijcJO3X0Ez6ELMBsbWMgPTRNCBfih2vD86xE9j/be2y4cHo0xCF851b 5lYAd9/xDXxA7b0a/usGVy8NpBQlvpEfo5k+oQRoba/ujZPsXF4saCEHXSho2BAE5a Y0SmiqxbiI30S/vkC9HEPqu0OUipvHOjzjhEv2UHQWGgfAVimC4kOk/gDC9Q8/EKOe 9mz+hyzhWFbVXwcm/IJ5zrGsw3OIjg/lTJkctRgWqNlQ8fXKHmhFaa26ZYWSthNbO7 fmcUxIkLVbtKg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Shunqian Zheng , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 52/79] media: i2c: ov5695: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:42 +0200 Message-Id: <569f2a2139747b431ae73d24ef931aa01f4ec029.1619519080.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/i2c/ov5695.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c index 09bee57a241d..469d941813c6 100644 --- a/drivers/media/i2c/ov5695.c +++ b/drivers/media/i2c/ov5695.c @@ -946,11 +946,9 @@ static int ov5695_s_stream(struct v4l2_subdev *sd, int= on) goto unlock_and_return; =20 if (on) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto unlock_and_return; - } =20 ret =3D __ov5695_start_stream(ov5695); if (ret) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519411; cv=none; d=zohomail.com; s=zohoarc; b=YfbEbc/R1vdyGvbmheOUYxD+b1h6vVCuYhtB/QZN9j++Ae3VVe8pUh+5DFuk9tZZhiO834lBfCqN8591N+AsZVJNrz/vZYVobk+cx8pHmRQZUodE2LTOTAMagVxPSsZTYoMfhjPut97zv5kx4HX29jOyULwkohjMrjzSyIyRBhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519411; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1aDFOD0xe1rfQUkQc9BC/hnY+ASpSxNBSg3lc87iwLw=; b=FNUz+hw9WFqwOtymIxe2bqIm5q+nB8oLaltrPzGKVH8WP2TSMylbCF7o8DuoS39RMCbhwSqbK8ELNMI7aHp+OUiZjtC7f/Zl1UU7MQDaK6poNDsXJb/qnn1Aom66J9ERPVeQtcCUIyn3woQi78UiU5K2txhTBmDAzk2P87Eth3E= 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 1619519411956365.45455456917; Tue, 27 Apr 2021 03:30:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236782AbhD0Kax (ORCPT ); Tue, 27 Apr 2021 06:30:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235650AbhD0K2F (ORCPT ); Tue, 27 Apr 2021 06:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4D4A1613F6; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1m-Ty; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=jUMHPV3bIyEEarOloeBBF8gl6HQ5pp77fQglK6LRWcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAR5z3FzbCYoIgNC02/1DgukwE4KbTwF4OtCFfJibw7xgD/1nwemJxgyBbiS//RTg E2XV0YjIVmM8WQrdykAeRV3PmhNi9ilduC+HSs6plbYOvp1Yhwa7yNqzIc4tKBU0VW a/LK/nLlNf1FdnaUIJ8qpz08StjOv0vkrYcH5KHUvtmklY6dZjr1GTKHREmBuw7zUE yhYAtMoBLEzt6WtDgHFZrYRaG+rdZoVeRrJxpA8o5HUk4+UZTqhVSArnPsShoOwmHD 7g/NB1ODy6+unOSCqQRSLn/oRYBm2j8lPtWiUakIzKgxAmhDbvn4D4bTjW5XuzJEaJ IzvoEskZkU2wg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Wenyou Yang , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 53/79] media: i2c: ov7740: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:43 +0200 Message-Id: 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/i2c/ov7740.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index ed6904b2e8f5..74219f67f245 100644 --- a/drivers/media/i2c/ov7740.c +++ b/drivers/media/i2c/ov7740.c @@ -624,11 +624,9 @@ static int ov7740_set_stream(struct v4l2_subdev *sd, i= nt enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); + if (ret < 0) goto err_unlock; - } =20 ret =3D ov7740_start_streaming(ov7740); if (ret) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519268; cv=none; d=zohomail.com; s=zohoarc; b=hIK6DhnP/7UW0ueJf46i4qE2C3jW8EjkDN+9Iz8yk+/ZBDBLOpxwEHHooJUNJOqT5klxdWWJK5lC+kN8mBDVFTY8F/KdI1R7ZlYtYyYUVfrIPEuV390pLPiv/LTVnSlJnzTKIwX2bX/bydzb/u+zJYn0vkAM0HTN0w6XuUGRarc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519268; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LgkqCMlRr/xDS4uHN4Wn17UWBeRlpBwTqujmM9tUotQ=; b=hQDnzjhRsetyJ1cFAoX7VvQ19ULpgoZc4O/rkY28NCloUJ2cOjBSQQv+F67eaAfaMM8fsvA5oLDg9eKr5eFG2QIW9OP5XJBE495b0nOdvvdyQe7zBD6QY8PxJYjwgmeyrFkwKMhL7MFBH3w2EO+vHWqPoEI5T1Rh6bHBRMCLEfk= 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 1619519268459343.7409822299368; Tue, 27 Apr 2021 03:27:48 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237885AbhD0K2a (ORCPT ); Tue, 27 Apr 2021 06:28:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235475AbhD0K2C (ORCPT ); Tue, 27 Apr 2021 06:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0EBC5613D2; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvx-000o1p-Vo; Tue, 27 Apr 2021 12:27:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=Z0USvyTZ3fXu9UhxRT5FD354jvvwjeNjqwFRY+Zs3l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U4qOa5eXEbpGJEnpDsn9AftbTcE4dVqd2rj0odesCHZJYdwjIatSJV6uN2bmLq4gT s+R+f5l4/CpAQGOBn0roIpgTfK7sILJqUb4QT6O/A05ME+iC4X4rYM9LMQylRwUvYO jy1slmdaBWu7g0UE6Rx3dGNwq/xR7HxYGvBbWULJTpI5tmKE2MtA0aK5J9HkqFSBKn iHvyT5BfLRnqu3pTjvQtBZ5GiWSKOpBUUUDGtS4U+IDUyoW6N+pB/RmG8izS4XdjUl 8qXcVUd+4rtqvk70yKmhPTQ507EPyu5pg+Eu7Ph58zQRorPfi8XTzV6sg2ntgKzyQZ G8NuztiTuARDg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dongchun Zhu , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 54/79] media: i2c: ov8856: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:44 +0200 Message-Id: <5e930e81ccf214e05cf5da85a34d8d9a79f21696.1619519080.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/i2c/ov8856.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index e3af3ea277af..2875f8e4ddcb 100644 --- a/drivers/media/i2c/ov8856.c +++ b/drivers/media/i2c/ov8856.c @@ -1340,9 +1340,8 @@ static int ov8856_set_stream(struct v4l2_subdev *sd, = int enable) =20 mutex_lock(&ov8856->mutex); if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&ov8856->mutex); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519605; cv=none; d=zohomail.com; s=zohoarc; b=QkfyROSjiy5khithweIJINZzrPrbe/QeMtpLFd8ZktENyFwtwKlPfYiXf4LDxoC3w7ZnFQBr8ogyc9Hz9ZhC5qtEGe7aX/FmzKFeBNbLyDBKdqg20huf08WBwG9DTH91/Egr0QswRQaOR6V2+cvXanGu8D/Rfb8BlgbCVos+uNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519605; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l0nFwYPWPiXFHgUKHwaK5u28Bc2/mwKnyZYYdjE5Uoc=; b=KXfHJyMPeEXi2AWDgrb4hiF2sV2aoeM6IIUstim3+mlFqsiPuX/MquyJYHDohXo2bF8ROZEK/9RFis3fUbrw5onw0iPP2YDI7eK9GdZvKPgx75qFbuIpYNuLJtcmG0Ad9Hc+v6dapnnMCTfNCcRad2zWiuCVYQ/OI3zVxBSjpuE= 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 1619519605813130.36999189837843; Tue, 27 Apr 2021 03:33:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238776AbhD0KeH (ORCPT ); Tue, 27 Apr 2021 06:34:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238032AbhD0K2d (ORCPT ); Tue, 27 Apr 2021 06:28:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D8D3A61440; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o1s-1S; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=oAi5YzlfFlQMfzPh3wYGQ2xjGcqBCgu57W3dE0PjRzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TA2KxyjYBmz7VGpPQfs1ZRA4qhA4C4EgrYpYcsSpvGfskc+qgJBZ785pDjbGxOZVt 3ji4e62BCGNQ3efEw4jZl6otpQTKjR2knN1t23/06Ke2ew+0dLkz2F4OHsIyYP+sqo m72KAZqTKQdgmEC2jzezKTjMoopp7pBNfo6NepjzgyjV4Sb4qLlyuXx2wuqQZZznE+ o/rdK1IH7eMlSAYysBjGsGpePe64H5L3TFRhpRZ2+T+JuUi8hOykq5MofI7PwOA8wz wU03ZSBAZJ+pho4UxbGLtiOQf8iCH2/Ju7O6YTQOTU0nW/9fixJHb1fknA0SKlncib 1U4OirlwahFdw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , =?UTF-8?q?K=C3=A9vin=20L=27h=C3=B4pital?= , Colin Ian King , Hans Verkuil , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , Yang Li , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 55/79] media: i2c: ov8865: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:45 +0200 Message-Id: <7984a7e594be7b812ebbcef913c34770608fbe4d.1619519080.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/i2c/ov8865.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index 9ecf180635ee..3bf6ee4898a9 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2497,11 +2497,9 @@ static int ov8865_s_stream(struct v4l2_subdev *subde= v, int enable) int ret; =20 if (enable) { - ret =3D pm_runtime_get_sync(sensor->dev); - if (ret < 0) { - pm_runtime_put_noidle(sensor->dev); + ret =3D pm_runtime_resume_and_get(sensor->dev); + if (ret < 0) return ret; - } } =20 mutex_lock(&sensor->mutex); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519549; cv=none; d=zohomail.com; s=zohoarc; b=Xpv6BtkRBY11RGkCSuz+Dj42Uj4iaUdlEn5IN+Yoi6xtyVa4tC4d+WWW6xC+tsDkNZOcuzvUR5OautVmJniISXLBlvOxp5Yy2vfDIQcYzp8xyBgbncMKCuNeEIZoDUxJJMm3aEhFw5SErnK6WRDTLjm8WgIywa8+R+49YURp030= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519549; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yiEtZ9AcmIFHMSqSXAh+mktXlCJrk2/tGS8Xq+uJxKo=; b=bChsDb6oj+Q6AU7dahu+b2vSB47Bav+fgGENVdC11ur8CHVSts1b15G+hU07KVPAddfUGS6nU2MpV8AH3D0pMckCPUUcNv8bOKOQA8VElF2m6RgN2tJuHdpfzhAQQeZ3yDGom446muvZKshpLm4+ypeUjWjmxeYMWMOQUF8YNAw= 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 1619519549798643.7075573179261; Tue, 27 Apr 2021 03:32:29 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238717AbhD0KdI (ORCPT ); Tue, 27 Apr 2021 06:33:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:48138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237809AbhD0K21 (ORCPT ); Tue, 27 Apr 2021 06:28:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C1BF261444; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o1v-3T; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=CBbCf8lLczURo0R8ANC6iiJbxWCN1ESFz/X/hIdzJFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ISvs+irbu3anVB6CGaQQsRIg16yW3x5K1rNr0PczprNrPRU7QV0izPVxX2k8qXpZ6 yNRYvw9v9YfeCoh1GVRFakwZTg1pHZ8Vo9JvBaVHGgRa2V0NjtN9hKKCzX2lZK1nMh cIBDJBwYSaajFJd5t5H9uBb8wIK+Gf0StLeunhB300YveQA6xv+RJ9wlQEKA3rs+mP uEcKznvxOj07f+UOQDO6wg4STqqEyADRqr/xlSrQ2fMoLjsVGMqyaV04PpMoTko3fF Wl4g/ZB2Cev+w1Wk+39HGfh98/ZioMIuxau7Ty4EsGZuK6q+uSrB+av8D5qXYuDggJ 2utOEjSgz6ZEQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bingbu Cao , Mauro Carvalho Chehab , Tianshu Qiu , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 56/79] media: i2c: ov9734: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:46 +0200 Message-Id: <7b8db39c23ac04405a790ea6af4f0224928f9bba.1619519080.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/i2c/ov9734.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov9734.c b/drivers/media/i2c/ov9734.c index b7309a551cae..ba156683c533 100644 --- a/drivers/media/i2c/ov9734.c +++ b/drivers/media/i2c/ov9734.c @@ -644,9 +644,8 @@ static int ov9734_set_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) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&ov9734->mutex); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519525; cv=none; d=zohomail.com; s=zohoarc; b=b+ZLh046TM79NG46miFJ4zpGawgPRu0vl34zelSI62GF3YE70+igXV9vrQEBWpBZ4fSgE171pq4/8BqcVQYJjd24Dh1QWz1SVQY4NG/O5iwIqTQlWflM5oT7LksccZhFOFWmQuSTnFwHra3yoRLMTbL40hkekKkK/v/MlVRYe9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519525; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MemQBCMDmE92SA4Dh34kjM0Xf+mWVXaAaIa5OPfJXiE=; b=ebwdgMu7lV6CXKsdX+OxLruIcSZS7ATGXxZwEq4ZSWOFOtAcI1A1hlCtJ1sEPVs+f2rRsrYDP7FHowGINXgU30KmqC73NE+mVqIpVGZZx4uHzcmgyaSmF2OTfRHaVCzZsyya7wHb1QR1nawkzTP4qyxSPs5A+Q0CxygjgHTWe4o= 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 1619519525806912.3650490231288; Tue, 27 Apr 2021 03:32:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238662AbhD0Kcq (ORCPT ); Tue, 27 Apr 2021 06:32:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:48192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237565AbhD0K2Y (ORCPT ); Tue, 27 Apr 2021 06:28:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF13D61439; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o1y-5Q; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=nHZL/8LfEY59F+jSTZXbI5IsJhAvjS0xN6pbKcv/Zf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K42/u+DsYc+oSSWW35cPcwyLr4uf8gaxJ/ZMErBo18r/4knuXkBmHz1yww2kFTKfA ig8N4evRJ4fKth3CydMKLxQ+hBAX3Klfs8agEXbChpHp74qnPxR14dA8ZjtyJC6NPl joVfiqiRXV/vPk8nQg/6UCKLMn96n+SQpuxnsnY5phJXWCR+SZaWH0OI1d7G5SlGDW IpmZ2gJbMGqbO4RxQhxqOYBR3iK8jWEaCfo0FLbeQtNRMuoXXYUR21pd39JCZx0/Tq TSnlHjnh8heEO+ie6BbUsrqfrlKzz2jzBsrgZQyPWHi1Kinvoc7rwZ8EBiO3F/arOJ 3RMuoC45+JMrA== 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 v3 57/79] media: i2c: tvp5150: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:47 +0200 Message-Id: <9e2fb36b577c9693f3c980cb26949c60cc3b8be8.1619519080.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/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; =20 if (enable) { - ret =3D pm_runtime_get_sync(sd->dev); - if (ret < 0) { - pm_runtime_put_noidle(sd->dev); + ret =3D pm_runtime_resume_and_get(sd->dev); + if (ret < 0) return ret; - } =20 tvp5150_enable(sd); =20 @@ -1675,15 +1673,7 @@ static int tvp5150_registered(struct v4l2_subdev *sd) =20 static int tvp5150_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) { - int ret; - - ret =3D 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); } =20 static int tvp5150_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519542; cv=none; d=zohomail.com; s=zohoarc; b=lTrj3NsXR9VgN3Nj7PGPrtm40Mag0g+1lGcchrRKc2xa7AJ4suMIf5lOpoYYXRwqZTnba6/YEsP57mJOE7QqAxy1W2Oli86hZhZnQlvqBtCbGhbBfCsT7HIS6sVhDTEF/DNCdM3VoZ2HCYJtkh/GXK3i9hsryDnYGZ9Xf8b+sqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519542; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6TxO13Hcq2LXkVzqJrqf06IWGakAOWK6g1rNPJ+wpFM=; b=niV+/7OXpkhg/BQ8nnKv6ZBCaFs6/3MP+wYY7xSxk6hmX+xNSOMtayNiKMz/6NWgaeWNR8jFhChxvZZoJLVrPm8jMCBqGGXqclH03Xw1Usw2b3PPO/lnTSprNAiV6siCA92UKzAOrF6Ia5VXFai12J5Xspj5Khw9FfzzWhfHLMk= 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 1619519542718964.4719425438147; Tue, 27 Apr 2021 03:32:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237684AbhD0KdD (ORCPT ); Tue, 27 Apr 2021 06:33:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237814AbhD0K21 (ORCPT ); Tue, 27 Apr 2021 06:28:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A8F3861434; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o21-7R; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=hgVIRXIaDP3qryP6Ow1GN4bGxSo94x3BXa49gnOI5oU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qcHhlDNCgJvovixng6tKu8qY7answGYlU684mGIVRMDoh3c972eQOJyCpJIdP3CQk NDrxNIigE+Bx3ZOuW3r0dxVz2zH1ux83diXDLyQoVbP29BV1wrBHPx8xvnM2wbB0QI jVEg0SkIfPjPCHiyvbHklpYW051MSz4bKAqwgcFUEeF68NeA6oYIH0LY0mDMd6tcBC PbYwUj8yuYZH/XPaNW3VOipSRFgeFWaIK0Q3chI+k4c1FegduUGCWdZ6egNO7i7qzC T0H+N19gDNZ5+MKR8o65ckKFzhipEB0hL53XIffpRmzFkHhmsc5Kh+npXK+ZxzszB5 d7zCHDKLiJ9JA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Matt Ranostay , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 58/79] media: i2c: video-i2c: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:48 +0200 Message-Id: <241b31b9049ab68992ac8ddbece2442d93fbabe7.1619519080.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/i2c/video-i2c.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index c9a774f4c8d2..910a139c5e14 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -286,11 +286,9 @@ static int amg88xx_read(struct device *dev, enum hwmon= _sensor_types type, __le16 buf; int tmp; =20 - tmp =3D pm_runtime_get_sync(regmap_get_device(data->regmap)); - if (tmp < 0) { - pm_runtime_put_noidle(regmap_get_device(data->regmap)); + tmp =3D pm_runtime_resume_and_get(regmap_get_device(data->regmap)); + if (tmp < 0) return tmp; - } =20 tmp =3D regmap_bulk_read(data->regmap, AMG88XX_REG_TTHL, &buf, 2); pm_runtime_mark_last_busy(regmap_get_device(data->regmap)); @@ -512,11 +510,9 @@ static int start_streaming(struct vb2_queue *vq, unsig= ned int count) if (data->kthread_vid_cap) return 0; =20 - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_noidle(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) goto error_del_list; - } =20 ret =3D data->chip->setup(data); if (ret) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519533; cv=none; d=zohomail.com; s=zohoarc; b=Occ2dO6VsnxCQ144Pr85bCqaak7Eso9SIkOxi3N5AT+NdrAA1moq58MqTbNsFvE7AhKGpaEwBXnDmWxH93YNC/NPviYrlBIhC7VJD2eEqFQt5T6oGBwZNucSJqBk4gMQ+3O1sNB1sLcb6ccCwdZIt4pTpBkWXFWA5FyUyvnIV+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519533; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ySrC2wlDMi90CsTzUZ9Z9K+attwrMxignhDqr647Jbg=; b=cnNa9lu8s2czSGLdbygolWU4SLr11Huo5ZZjP1vPpZPY3+nsLWn41VBeIrUH6+LGU2aaMEhhVlHKn3tzYc5CGXQ0891lU5KRebyRBkoydHWFNaw58NwxyyjtO899Jppdn5pw5FxLy+HX2JmfBPgX7wbor/w4Lox4eEm6JxJS5FI= 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 161951953376087.50423363001664; Tue, 27 Apr 2021 03:32:13 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238288AbhD0Kcz (ORCPT ); Tue, 27 Apr 2021 06:32:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235463AbhD0K20 (ORCPT ); Tue, 27 Apr 2021 06:28:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A667861432; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o24-9L; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=AWaRUuBTKGjvblFCBeNGn4e+vA3INJOtepNAWbdP4RE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T9W0Vuvr6+gV8tq55gTnOpltULBX7jBEm6Dh/6niGD8yy47Wx+418XsxnqmLu+83m jAt1J/mqZ204qtaCm2SnbOO9WG6OVEJfZUTFhKwuBY7sRiL3OXGDstQv/US7JHsgID DJpqgutZJd3XiOF5JQQEbJG7TuS8xi24xubZAd6BsMX597ajD4REHoeMpnmWcUObsX Vy+mkXuR8x0zwpVtE4KkMlNCb2Y9oK5gW9dpcB8+nh2nGXAtsqAesaEaAWOT42od2u 7pc8bjEpB3RRHyBCfOTADxZAfLlkGplAhoBilztgSXIuEpLJqaofkwSGHeJbAAlgLl ifSKX3YGSsOyg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Jean-Christophe Trotin , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 59/79] media: sti/hva: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:49 +0200 Message-Id: <0a396696a6a6d4398a91fedde53f992035a463c3.1619519080.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. While the hva driver does it right, there are lots of errors on other drivers due to its misusage. So, let's change this driver to also use pm_runtime_resume_and_get(), as we're doing similar changes all over the media subsystem. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/sti/hva/hva-hw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platfo= rm/sti/hva/hva-hw.c index f59811e27f51..77b8bfa5e0c5 100644 --- a/drivers/media/platform/sti/hva/hva-hw.c +++ b/drivers/media/platform/sti/hva/hva-hw.c @@ -270,9 +270,8 @@ static unsigned long int hva_hw_get_ip_version(struct h= va_dev *hva) struct device *dev =3D hva_to_dev(hva); unsigned long int version; =20 - if (pm_runtime_get_sync(dev) < 0) { + if (pm_runtime_resume_and_get(dev) < 0) { dev_err(dev, "%s failed to get pm_runtime\n", HVA_PREFIX); - pm_runtime_put_noidle(dev); mutex_unlock(&hva->protect_mutex); return -EFAULT; } @@ -386,10 +385,10 @@ int hva_hw_probe(struct platform_device *pdev, struct= hva_dev *hva) pm_runtime_set_suspended(dev); pm_runtime_enable(dev); =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) { dev_err(dev, "%s failed to set PM\n", HVA_PREFIX); - goto err_pm; + goto err_clk; } =20 /* check IP hardware version */ @@ -462,6 +461,7 @@ int hva_hw_execute_task(struct hva_ctx *ctx, enum hva_h= w_cmd_type cmd, u8 client_id =3D ctx->id; int ret; u32 reg =3D 0; + bool got_pm =3D false; =20 mutex_lock(&hva->protect_mutex); =20 @@ -469,12 +469,13 @@ int hva_hw_execute_task(struct hva_ctx *ctx, enum hva= _hw_cmd_type cmd, enable_irq(hva->irq_its); enable_irq(hva->irq_err); =20 - if (pm_runtime_get_sync(dev) < 0) { + if (pm_runtime_resume_and_get(dev) < 0) { dev_err(dev, "%s failed to get pm_runtime\n", ctx->name); ctx->sys_errors++; ret =3D -EFAULT; goto out; } + got_pm =3D true; =20 reg =3D readl_relaxed(hva->regs + HVA_HIF_REG_CLK_GATING); switch (cmd) { @@ -537,7 +538,8 @@ int hva_hw_execute_task(struct hva_ctx *ctx, enum hva_h= w_cmd_type cmd, dev_dbg(dev, "%s unknown command 0x%x\n", ctx->name, cmd); } =20 - pm_runtime_put_autosuspend(dev); + if (got_pm) + pm_runtime_put_autosuspend(dev); mutex_unlock(&hva->protect_mutex); =20 return ret; @@ -553,9 +555,8 @@ void hva_hw_dump_regs(struct hva_dev *hva, struct seq_f= ile *s) =20 mutex_lock(&hva->protect_mutex); =20 - if (pm_runtime_get_sync(dev) < 0) { + if (pm_runtime_resume_and_get(dev) < 0) { seq_puts(s, "Cannot wake up IP\n"); - pm_runtime_put_noidle(dev); mutex_unlock(&hva->protect_mutex); return; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519569; cv=none; d=zohomail.com; s=zohoarc; b=iEn2fQpqZO/BGlk+LjHZYN2bMgkmNds4uncgeQTV8TyFykK5qM8JS2MNXAmOTbVfiUnik9Qi8h1cHdRs0eZvJi8TyY98vX8oHke7H0ffu4wfKlPeHNUZTf0Bw79zQtYg5KDPW7VQgkLrQrzaR9UuelDYpIuNpwP51WeiOuTO3dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519569; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xBlzsmljHnZdUOJwld2xAtN8nqg8/ojsuyONQQwmun8=; b=YlGPmjm7Nfy1TmBRqGKCGljPEx2Me/RPTnVx3HyHou94f4dOT/fSABPzg06XO9seQJWuRAF1/a1Wvi7ygxDONY8h07VptIBoctiMHt3gxgw8XQGEZ8574Xdob7NlE1DA8sD1IJLdKH0SqXIVbsRx8boOgsX8iBeATtjFj03fJmc= 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 1619519569193152.28510362455972; Tue, 27 Apr 2021 03:32:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238158AbhD0Kd3 (ORCPT ); Tue, 27 Apr 2021 06:33:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237957AbhD0K2b (ORCPT ); Tue, 27 Apr 2021 06:28:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A17046142E; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o27-BM; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=WMp2TYCwNpx5gqoBY3FxSLCFIcbo/CZW59R5D62z+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RGghy5CizAQ4cGRG3F08+R71O0onTP2CoJTE+NNH9LVpyKN+NegeomgZOjKcp8XzO gKsauzHXBUxpfc0E3b7wPtvOH/NmquSPcHaLiDNZGDT0xCeqYw9nzh9vXhsIOP45eX zG1ks1f4ktXBpItrpi10e988WdGczY7dvnlwXb9/VJSWXgL/GRu2l37NgEl42pTHp7 0NzKcMnyL6Xk+2YahXBhVTZqnuz4BG9LR/1oAo/0Q+/rFh8mQRrwkR/OTfUhGexEZE uLqITCMpjj7x3Q/9JSXhdn1ucBkKy6XhNw0Ze4x9IxNqiGfm+GG/1GdPURgiESWVAa qsFmLa1GQp9Wg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bingbu Cao , Dan Scally , Mauro Carvalho Chehab , Sakari Ailus , Tianshu Qiu , Yong Zhi , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 60/79] media: ipu3: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:50 +0200 Message-Id: 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/pci/intel/ipu3/ipu3-cio2-main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/= pci/intel/ipu3/ipu3-cio2-main.c index fecef85bd62e..ca8040d1a725 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c @@ -975,10 +975,9 @@ static int cio2_vb2_start_streaming(struct vb2_queue *= vq, unsigned int count) cio2->cur_queue =3D q; atomic_set(&q->frame_sequence, 0); =20 - r =3D pm_runtime_get_sync(&cio2->pci_dev->dev); + r =3D pm_runtime_resume_and_get(&cio2->pci_dev->dev); if (r < 0) { dev_info(&cio2->pci_dev->dev, "failed to set power %d\n", r); - pm_runtime_put_noidle(&cio2->pci_dev->dev); return r; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519477; cv=none; d=zohomail.com; s=zohoarc; b=QUFqcW7uIQ1+bWKML6jSWE6jCvM+OokYpuyij/5IoRphbjvZr+ByHtXKNePyV8yJQS32m7/+kB28LIRccH4NIeVG+MkIInouG5PWTzA2DxSyq+PBwFOI0BlNZCvkSLRBj3Z8rc1mx2h2LW2iBl7cvaWkSML6l2HVZg6fyNj7d2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519477; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ov9INiNJQ9EjSNAXOplGis0CoH/4o7eSRe39sYD+EEE=; b=aNlDLKFxvr0QvPQhVclp095D3j/lop/9wgf0SndQpWZt8T6o5MBwXkapEshQkjqiJwXNk+wUKewKLC4MzoV5CPCMnxfBeqAWYcjjc7kxGxSUEe7oRIXftY44WlfgCYq8PTPVRF/jdsQqngLziQHUoSCRXxafANSI/sbve4q8wuI= 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 1619519477057231.336232521615; Tue, 27 Apr 2021 03:31:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238517AbhD0Kb6 (ORCPT ); Tue, 27 Apr 2021 06:31:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:48158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237007AbhD0K2R (ORCPT ); Tue, 27 Apr 2021 06:28:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9E4516142C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2A-DU; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=xptLiLCkGNJuz7QvbfWAgofgWCEJyWuHFXhmxlDN2vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZ3ZhFUjbTS1iMpeVcRn4Y9ddHEha8/IjDjXzCeJTgj8gJuYEIht+yvo559v2hl7z 6VtjihmxZOyRF2q/CtMG1YyXVDsYo/D2MJ5kTp46EI/t9Qb67Dewel0RikOKsq+i2p 4tX0X6aNe71mjqWBJ1IplJKlMm7JnKJplalklKyTbYBXGGjWrAp8H/df9Rgdzb5okL jV3h4UCm48GAHsQmPbjc18kkIjBco2Nvl6P/AXhX9uKyabRrKpD1Js1LGD2pMgQTEB j4a/9tIgTSJn5y9cVNkYUiRE42l1vXuajC4tN+2X0sY/apXbBIsqmdBBN/BK+ixdd3 hm+CZmNQ1nyDA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Philipp Zabel , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 61/79] media: coda: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:51 +0200 Message-Id: <18b66005a971b96fd50fea61da138a1bcc68bd8c.1619519080.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/coda/coda-common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/plat= form/coda/coda-common.c index bd666c858fa1..13ff05e7d850 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -2660,10 +2660,10 @@ static int coda_open(struct file *file) ctx->use_vdoa =3D false; =20 /* Power up and upload firmware if necessary */ - ret =3D pm_runtime_get_sync(dev->dev); + ret =3D pm_runtime_resume_and_get(dev->dev); if (ret < 0) { v4l2_err(&dev->v4l2_dev, "failed to power up: %d\n", ret); - goto err_pm_get; + goto err_fh_del; } =20 ret =3D clk_prepare_enable(dev->clk_per); @@ -2709,6 +2709,7 @@ static int coda_open(struct file *file) clk_disable_unprepare(dev->clk_per); err_pm_get: pm_runtime_put_sync(dev->dev); +err_fh_del: v4l2_fh_del(&ctx->fh); v4l2_fh_exit(&ctx->fh); err_coda_name_init: --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519563; cv=none; d=zohomail.com; s=zohoarc; b=hoifISNulb12Mx91HS5PdT1JBZiG4PEueu5KJXgWLB5DFATQO6F48LQOO8L+tQfYoC+9ac2TaM1cPzbP60HDCYBaRfkhfOWT3dShlL94yo7oHDJ6Q+fgTU37shEg0ftQCdbe8+HBbKvrEIKUp9gmc/n1Vmtgxto7movU5hjpgEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519563; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JGMzFK5pj8GmyWgHqubT/I8/fNs6Y/LAlUxCKRM6Q/A=; b=AuEoM8bjSwDGyeaas+/LVsbNJS/fbGBZ4brQnn3heYYfjhrLLAE8GpWSmuuMjVdquEEXFuCnPnI+zOlWl0BK0SCi+kUnC1tucOKmt9T/AcfDKUDRvQIBvWvKB0SHg8pswGzc8MtzLG3ciIord1uBpdHN+CK3S4B/ijRcDTU2H28= 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 1619519563045757.0724440386737; Tue, 27 Apr 2021 03:32:43 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235553AbhD0KdY (ORCPT ); Tue, 27 Apr 2021 06:33:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:48150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235809AbhD0K22 (ORCPT ); Tue, 27 Apr 2021 06:28:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 98B9261429; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2D-FS; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=vqCg/VqSgTT9WFZipquUww7WREOlNkMrO5HLAuTAHyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=itp3WSbWletAQ14jr15/JCK46HjrrIMAccioMAWp0h5vaS3ot2kqBeaJllL8CQYvA eCIbrgpaVUbU+lpmwq8EKksaZ1eIlt2hmqbuTPMXXViu85DJIyIvlVHOsk1b/X/YSS LFbIQA1tUvECsreMQpqklmyfC4O1tM7TdsA/0reb8SVTxccBHJ3Aq+W5A9m0Nc7OIT zQqv4MLoANgUfMyz18hynaQRW3CNnzXdoqHZslA2pKmmQoyKbMGo7m6zhnyDgNpES3 lo5+c4TYSqOFv1kEjjGOFItQh1Ltej2KU8ZNmuoCmScvCMtnGi9/aOdgBI/fh6DJKm czXbZma2d03Yw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Krzysztof Kozlowski , Mauro Carvalho Chehab , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 62/79] media: exynos4-is: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:52 +0200 Message-Id: <834b16534ae8e18a29c734956e3eda671d455451.1619519080.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/exynos4-is/fimc-capture.c | 6 ++---- drivers/media/platform/exynos4-is/fimc-is.c | 4 ++-- drivers/media/platform/exynos4-is/fimc-isp-video.c | 3 +-- drivers/media/platform/exynos4-is/fimc-isp.c | 7 +++---- drivers/media/platform/exynos4-is/fimc-lite.c | 5 +++-- drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- drivers/media/platform/exynos4-is/media-dev.c | 8 +++----- drivers/media/platform/exynos4-is/mipi-csis.c | 8 +++----- 8 files changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/med= ia/platform/exynos4-is/fimc-capture.c index 13c838d3f947..0da36443173c 100644 --- a/drivers/media/platform/exynos4-is/fimc-capture.c +++ b/drivers/media/platform/exynos4-is/fimc-capture.c @@ -478,11 +478,9 @@ static int fimc_capture_open(struct file *file) goto unlock; =20 set_bit(ST_CAPT_BUSY, &fimc->state); - ret =3D pm_runtime_get_sync(&fimc->pdev->dev); - if (ret < 0) { - pm_runtime_put_sync(&fimc->pdev->dev); + ret =3D pm_runtime_resume_and_get(&fimc->pdev->dev); + if (ret < 0) goto unlock; - } =20 ret =3D v4l2_fh_open(file); if (ret) { diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/pl= atform/exynos4-is/fimc-is.c index 972d9601d236..1b24f5bfc4af 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -828,9 +828,9 @@ static int fimc_is_probe(struct platform_device *pdev) goto err_irq; } =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) - goto err_pm; + goto err_irq; =20 vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32)); =20 diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/m= edia/platform/exynos4-is/fimc-isp-video.c index 612b9872afc8..8d9dc597deaa 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c @@ -275,7 +275,7 @@ static int isp_video_open(struct file *file) if (ret < 0) goto unlock; =20 - ret =3D pm_runtime_get_sync(&isp->pdev->dev); + ret =3D pm_runtime_resume_and_get(&isp->pdev->dev); if (ret < 0) goto rel_fh; =20 @@ -293,7 +293,6 @@ static int isp_video_open(struct file *file) if (!ret) goto unlock; rel_fh: - pm_runtime_put_noidle(&isp->pdev->dev); v4l2_fh_release(file); unlock: mutex_unlock(&isp->video_lock); diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/p= latform/exynos4-is/fimc-isp.c index a77c49b18511..74b49d30901e 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp.c +++ b/drivers/media/platform/exynos4-is/fimc-isp.c @@ -304,11 +304,10 @@ static int fimc_isp_subdev_s_power(struct v4l2_subdev= *sd, int on) pr_debug("on: %d\n", on); =20 if (on) { - ret =3D pm_runtime_get_sync(&is->pdev->dev); - if (ret < 0) { - pm_runtime_put(&is->pdev->dev); + ret =3D pm_runtime_resume_and_get(&is->pdev->dev); + if (ret < 0) return ret; - } + set_bit(IS_ST_PWR_ON, &is->state); =20 ret =3D fimc_is_start_firmware(is); diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/= platform/exynos4-is/fimc-lite.c index fe20af3a7178..4d8b18078ff3 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/exynos4-is/fimc-lite.c @@ -469,9 +469,9 @@ static int fimc_lite_open(struct file *file) } =20 set_bit(ST_FLITE_IN_USE, &fimc->state); - ret =3D pm_runtime_get_sync(&fimc->pdev->dev); + ret =3D pm_runtime_resume_and_get(&fimc->pdev->dev); if (ret < 0) - goto err_pm; + goto err_in_use; =20 ret =3D v4l2_fh_open(file); if (ret < 0) @@ -499,6 +499,7 @@ static int fimc_lite_open(struct file *file) v4l2_fh_release(file); err_pm: pm_runtime_put_sync(&fimc->pdev->dev); +err_in_use: clear_bit(ST_FLITE_IN_USE, &fimc->state); unlock: mutex_unlock(&fimc->lock); diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/p= latform/exynos4-is/fimc-m2m.c index c9704a147e5c..7c1eb05c508f 100644 --- a/drivers/media/platform/exynos4-is/fimc-m2m.c +++ b/drivers/media/platform/exynos4-is/fimc-m2m.c @@ -75,7 +75,7 @@ static int start_streaming(struct vb2_queue *q, unsigned = int count) struct fimc_ctx *ctx =3D q->drv_priv; int ret; =20 - ret =3D pm_runtime_get_sync(&ctx->fimc_dev->pdev->dev); + ret =3D pm_runtime_resume_and_get(&ctx->fimc_dev->pdev->dev); return ret > 0 ? 0 : ret; } =20 diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/= platform/exynos4-is/media-dev.c index 13d192ba4aa6..9346d44a06c2 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c @@ -512,11 +512,9 @@ static int fimc_md_register_sensor_entities(struct fim= c_md *fmd) if (!fmd->pmf) return -ENXIO; =20 - ret =3D pm_runtime_get_sync(fmd->pmf); - if (ret < 0) { - pm_runtime_put(fmd->pmf); + ret =3D pm_runtime_resume_and_get(fmd->pmf); + if (ret < 0) return ret; - } =20 fmd->num_sensors =3D 0; =20 @@ -1291,7 +1289,7 @@ static int cam_clk_prepare(struct clk_hw *hw) if (camclk->fmd->pmf =3D=3D NULL) return -ENODEV; =20 - ret =3D pm_runtime_get_sync(camclk->fmd->pmf); + ret =3D pm_runtime_resume_and_get(camclk->fmd->pmf); return ret < 0 ? ret : 0; } =20 diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/= platform/exynos4-is/mipi-csis.c index 1aac167abb17..2a6afb78a049 100644 --- a/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/exynos4-is/mipi-csis.c @@ -494,7 +494,7 @@ static int s5pcsis_s_power(struct v4l2_subdev *sd, int = on) struct device *dev =3D &state->pdev->dev; =20 if (on) - return pm_runtime_get_sync(dev); + return pm_runtime_resume_and_get(dev); =20 return pm_runtime_put_sync(dev); } @@ -509,11 +509,9 @@ static int s5pcsis_s_stream(struct v4l2_subdev *sd, in= t enable) =20 if (enable) { s5pcsis_clear_counters(state); - ret =3D pm_runtime_get_sync(&state->pdev->dev); - if (ret && ret !=3D 1) { - pm_runtime_put_noidle(&state->pdev->dev); + ret =3D pm_runtime_resume_and_get(&state->pdev->dev); + if (ret && ret !=3D 1) return ret; - } } =20 mutex_lock(&state->lock); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519512; cv=none; d=zohomail.com; s=zohoarc; b=GTSjhPNGPncd8DwBHmAhf637MNJHAVlorjXke3PV7or52q6cvNR6SMBrNqExk3XKNp0hSeYfRmsEgowG5VC+cd4dm8OVeq8WhmJtk9ZYEMQcT11q/q0+066o7J7e3Fv8MNWLCi4sx1H7wMD7Fdmc6tdHGwk7TpKPPoB1vzTn8cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519512; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=92yCGI6NlidjS1v2MbWSqaev+dYY6vtMqPULSzyb5N8=; b=AUB9b/S74bVrnW/ZNGxR8+jU6EGOP0h/y8PpCNdZQULg/F0/YVNQ9ychgWrEo81/tzavReLINMmSN2CstQi4wAhTV2s6n/4cn/OolE5CFQjsRt6zzusfcJUYmj7V9YFzaaZ4yh1QKDt2pPSmFSgnZexnf4Mbj9i3ztC68tOI24w= 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 1619519512819668.4746211808344; Tue, 27 Apr 2021 03:31:52 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238496AbhD0Kce (ORCPT ); Tue, 27 Apr 2021 06:32:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:48146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237224AbhD0K2S (ORCPT ); Tue, 27 Apr 2021 06:28:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8CA386141F; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2G-Hs; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=TKtKuWw4arj9gE1QW5A97zHnmgQIngfUHjaR8gvLIr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rUr3XgQuedmLRMxjU5/vIt9xq3JpbinPSkcPt7Dz1Nr7mpIwQU54XeKkV2+9fauMg UtwDc1uiaw4jUHBLclcuWpvNy7kKe/oIedeoS5hRLUKpLKCyQ0pFkMvOQH22vWhCTR gtT9bNbpZuSJNag3ObXD/ra+CB3+kP2q9tBhMoTJfZscEh7B/A9HY42AXeKkfBYKgT ZEZHvMbEEJq8/S9BMQAIv+ptY+MyDDODXUxs8X31QH1/1dLZixmyRieoCnXGGo8gXe eJ1mFW1Si0KDKVNyKkvCfk/+hPAIwPie8MgfkJ91EGfb7sG8jysDUPg4Tus9jmR/DI izVJtK3Pm7u9A== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Hans Verkuil , Krzysztof Kozlowski , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 63/79] media: exynos-gsc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:53 +0200 Message-Id: <5a8d3ca13956feb5e611cb1fe08195966be5edf2.1619519080.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/exynos-gsc/gsc-m2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/pl= atform/exynos-gsc/gsc-m2m.c index 27a3c92c73bc..09551e96ac15 100644 --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c @@ -58,7 +58,7 @@ static int gsc_m2m_start_streaming(struct vb2_queue *q, u= nsigned int count) struct gsc_ctx *ctx =3D q->drv_priv; int ret; =20 - ret =3D pm_runtime_get_sync(&ctx->gsc_dev->pdev->dev); + ret =3D pm_runtime_resume_and_get(&ctx->gsc_dev->pdev->dev); return ret > 0 ? 0 : ret; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519479; cv=none; d=zohomail.com; s=zohoarc; b=V0IQ1yWjSeVoUUgAV0ywym4IIhZXc7zPWhEjZOkVZQxkG/OwDGLKBIV78qnGlh77E8HtrCcU3uAsdCWDpmeIQV0yKtWqhbUmfnFOhvxu4SyFS9O9in9ZB8IUrXD53k56JJ6Cd2tSJqnbBykv+WZ28yvYT6FMV+CDhkejGXP4h4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519479; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6tWS5AWeHgEG14BxYeaqs+XN0hv2Iox9SZeAydDvL1Y=; b=ip/GcVt9vCAiNoaU/TAy2CDKZM5jifL/3dcPdfHUG4mBytsFY9SRMc/Mjq2l1M4VYnyMmEmesaHDWBSrDFlmFwnpNygTtEGynRtnxW7TtnjIjvodRi0J6ZsbKguZuj19J9Ax1gDISXalk6HIRt5GVqMxUhkQMdesy6bglRONir4= 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 1619519479766197.27186748091503; Tue, 27 Apr 2021 03:31:19 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235729AbhD0KcB (ORCPT ); Tue, 27 Apr 2021 06:32:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236913AbhD0K2R (ORCPT ); Tue, 27 Apr 2021 06:28:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8C2176141E; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2J-Jt; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=tu2hhB6CHAZbCfvPd96Qq+9zsUaGe3IxV7AH+2XbuEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWCJ5+YzV+LcsvBasttI5OaUINWopbWyj5/ga5/WC9JOzN7NxnwTRnzkoR7yiIP3M +PJcHT2kOzktyDUf+En6mdaLVD47HSRIUekSKGttv24KunrF/o7IWKUQgRHxBmRmxP NAKUYCWxqb2ukUddcCcWJe/3opHkQSJ1dpwhkJOnO2HzTPUY/+PvRjKo7uC0AJ/lYE mMICK4o0IugbeRbRrm+pqk6xcnDCcGjbzvzPuJxm4d09/tBaTO7XGgbv3oFX0coXZp kXMCdv3dhLDoUl1ET24dOAze3Z4SUP89d10BaIGokgAoVe1ecYRQdNporXx9cbZbGy UmAxT+47WFBhQ== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Bin Liu , Matthias Brugger , Mauro Carvalho Chehab , Rick Chang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v3 64/79] media: mtk-jpeg: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:54 +0200 Message-Id: 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/mtk-jpeg/mtk_jpeg_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/medi= a/platform/mtk-jpeg/mtk_jpeg_core.c index 88a23bce569d..a89c7b206eef 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -920,7 +920,7 @@ static void mtk_jpeg_enc_device_run(void *priv) src_buf =3D v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx); dst_buf =3D v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); =20 - ret =3D pm_runtime_get_sync(jpeg->dev); + ret =3D pm_runtime_resume_and_get(jpeg->dev); if (ret < 0) goto enc_end; =20 @@ -973,7 +973,7 @@ static void mtk_jpeg_dec_device_run(void *priv) return; } =20 - ret =3D pm_runtime_get_sync(jpeg->dev); + ret =3D pm_runtime_resume_and_get(jpeg->dev); if (ret < 0) goto dec_end; =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519559; cv=none; d=zohomail.com; s=zohoarc; b=IWxxSr9fm09kS5XpG9qCAcipwZEUNXEYrpj+uOrCaUsPuR1HBLM255L2QV/qFWCMtmJpJ6cbT/z/S0DkpEOJfp3PdxEO0CkE+vpXpI/me2GvzZlx0QXlGlV1p9rCwjxes8eLu5N8qoWKWdC/QA4YFNs6HEmDJe2llU1rMe50BGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519559; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uIuBJmF0HMMlsWHg0vzZdGoLC6Q8BIvrlc0MUDc9Jqg=; b=ZqmuHRakISJLnuUP+jGrJwCplmDv6VaVNGsHn7gMlYmcIn089shasvFLCnl9yIRM4haBfYG9b2+RitaUQ3tp3B2eMam5ulFw1DBmQu3rhSByurv1FHfz+PaPuCE9r/RLTkAyMKMFT0CEs1ASfvuSMQB5Jeohgq6P1ivgOT2lUAA= 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 1619519559128780.4836694261276; Tue, 27 Apr 2021 03:32:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235859AbhD0KdS (ORCPT ); Tue, 27 Apr 2021 06:33:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:48270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237851AbhD0K22 (ORCPT ); Tue, 27 Apr 2021 06:28:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD4C161436; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2M-M1; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=wdynVwwhyvqKibF+xyVsNRL7Ix8YvvILE1Sgr+qtqMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldzIh2yqsG2c3vamAmCi5eaUWrj0yShSgybGRILHpqFXuKxx7hwuYFC5Lasq8a4SZ ofKknVNKaWNfzxiHHrE1JJrJGxJaQ/onsmuK7t1ccVgt8Vf44KofqeFgMjzY8ByzNa KhKnKC0WQc5qVcIcYTkzhn6Z9pcdNeAzv1RFH0+p6CyB8CQbpKZjRaIUHT8xeNUzUR kSihDTnCJhDR6U5FPxlAMxpWAKwG/ro+yTknznfQ4von6k1AKatPD+lLvcmrXUy8pZ U4pmBiItP1s3+MV21dxpriatiKmd4ISADk3d1XJIK2pmQ5DR5QYjGaEFZrxXF7CGJR 07BiyWqL5U92Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Robert Foss , Todor Tomov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 65/79] media: camss: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:55 +0200 Message-Id: <9eebf979608bdbd1780c226383bb084ff8041aa1.1619519080.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. Reviewed-by: Robert Foss Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/qcom/camss/camss-csid.c | 6 ++---- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 ++---- drivers/media/platform/qcom/camss/camss-ispif.c | 6 ++---- drivers/media/platform/qcom/camss/camss-vfe.c | 5 +++-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media= /platform/qcom/camss/camss-csid.c index cc11fbfdae13..d2a7f2a64f26 100644 --- a/drivers/media/platform/qcom/camss/camss-csid.c +++ b/drivers/media/platform/qcom/camss/camss-csid.c @@ -156,11 +156,9 @@ static int csid_set_power(struct v4l2_subdev *sd, int = on) int ret; =20 if (on) { - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } =20 ret =3D regulator_enable(csid->vdda); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/med= ia/platform/qcom/camss/camss-csiphy.c index b3c3bf19e522..8e18b8e668cf 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -197,11 +197,9 @@ static int csiphy_set_power(struct v4l2_subdev *sd, in= t on) if (on) { int ret; =20 - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } =20 ret =3D csiphy_set_clock_rates(csiphy); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/medi= a/platform/qcom/camss/camss-ispif.c index 37611c8861da..d9907742ba79 100644 --- a/drivers/media/platform/qcom/camss/camss-ispif.c +++ b/drivers/media/platform/qcom/camss/camss-ispif.c @@ -372,11 +372,9 @@ static int ispif_set_power(struct v4l2_subdev *sd, int= on) goto exit; } =20 - ret =3D pm_runtime_get_sync(dev); - if (ret < 0) { - pm_runtime_put_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) goto exit; - } =20 ret =3D camss_enable_clocks(ispif->nclocks, ispif->clock, dev); if (ret < 0) { diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/= platform/qcom/camss/camss-vfe.c index 15695fd466c4..cf743e61f798 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -584,9 +584,9 @@ static int vfe_get(struct vfe_device *vfe) if (ret < 0) goto error_pm_domain; =20 - ret =3D pm_runtime_get_sync(vfe->camss->dev); + ret =3D pm_runtime_resume_and_get(vfe->camss->dev); if (ret < 0) - goto error_pm_runtime_get; + goto error_domain_off; =20 ret =3D vfe_set_clock_rates(vfe); if (ret < 0) @@ -620,6 +620,7 @@ static int vfe_get(struct vfe_device *vfe) =20 error_pm_runtime_get: pm_runtime_put_sync(vfe->camss->dev); +error_domain_off: vfe->ops->pm_domain_off(vfe); =20 error_pm_domain: --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519551; cv=none; d=zohomail.com; s=zohoarc; b=KnUcjL/MQz2YeIW0zcIK2QU+iZE0nrfjwkpC9rDOahAQoXev8lTjLsZmWIlutz46DBP2gkkxFsXM8lihf53MjQO8pn49+9kVHc/SeZZnUkAjeVvymLp6ZrGHM4nhLCI+d7//jbL88DXxaB+Zmf24UBNLESYmAAV8y944soSy6xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519551; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YtQ0P1vd+y8srWxmBNsx/NSrqEwKQuCn+Cs9Cghe4oI=; b=A08WG1g2NN1xcMFQBdC2a83ydsVVN6d+4W6KHBgChC1LFzXWjLG8t8ay+OqFi/x1Q+Tl3Uc8nHoF0HcTJM5vUt0cDEK4FRmgmms88kyzp7Pk02udSRGMXenAbhFFRLvHfgox3yuHZTeurvQ8PcQMDkLVOOz6AWWDb+Bsg/PNEKA= 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 1619519551826483.8415909675955; Tue, 27 Apr 2021 03:32:31 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238729AbhD0KdN (ORCPT ); Tue, 27 Apr 2021 06:33:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:48260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235457AbhD0K22 (ORCPT ); Tue, 27 Apr 2021 06:28:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A448A61430; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2P-OO; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=8E/41fS9i4G6Idc8E3ODBm45B0Q7is3E1XHHj0lw4IM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uzR0YITLqQMiwRM9ehaatpVhDOhoa6bkDISpYwYSs1GFAd87BAmkInT2oOpFwQi97 XUnS+klbWiDd9v4nupvdCm+n7fDw5PyR2TBpHy6/IQ6VwT+c8HuT2HcGUjhrjBbbcx 3gkkFdkXRalCXsc7Azrt8+XkZ0eOSLXhnB7NQFfBpQ1kdzcW+YCSnRygJmQG8AbsDb FMwxA5/0ygc/sSCODFONG93ZY+jyEM4w/A9ELdLkkgd3rRtoMsUCIOOr5iNhjerKpO wAKqhhmjol/CB+ZrtwavkV62rQZhXe90aakSLUREj965ISG/WPV55NyGaIJNymbmVf aooTxddpxozNA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 66/79] media: venus: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:56 +0200 Message-Id: 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/qcom/venus/core.c | 30 +++++++++---------- .../media/platform/qcom/venus/pm_helpers.c | 10 +++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index c80c27c87ccc..aa359f8e82c5 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -84,11 +84,9 @@ static void venus_sys_error_handler(struct work_struct *= work) container_of(work, struct venus_core, work.work); int ret =3D 0; =20 - ret =3D pm_runtime_get_sync(core->dev); - if (WARN_ON(ret < 0)) { - pm_runtime_put_noidle(core->dev); + ret =3D pm_runtime_resume_and_get(core->dev); + if (WARN_ON(ret < 0)) return; - } =20 hfi_core_deinit(core, true); =20 @@ -110,11 +108,9 @@ static void venus_sys_error_handler(struct work_struct= *work) =20 hfi_reinit(core); =20 - ret =3D pm_runtime_get_sync(core->dev); - if (WARN_ON(ret < 0)) { - pm_runtime_put_noidle(core->dev); + ret =3D pm_runtime_resume_and_get(core->dev); + if (WARN_ON(ret < 0)) return; - } =20 ret =3D venus_boot(core); ret |=3D hfi_core_resume(core, true); @@ -313,21 +309,21 @@ static int venus_probe(struct platform_device *pdev) =20 pm_runtime_enable(dev); =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) goto err_runtime_disable; =20 ret =3D of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D venus_firmware_init(core); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D venus_boot(core); if (ret) - goto err_runtime_disable; + goto err_pm; =20 ret =3D hfi_core_resume(core, true); if (ret) @@ -359,8 +355,9 @@ static int venus_probe(struct platform_device *pdev) v4l2_device_unregister(&core->v4l2_dev); err_venus_shutdown: venus_shutdown(core); -err_runtime_disable: +err_pm: pm_runtime_put_noidle(dev); +err_runtime_disable: pm_runtime_set_suspended(dev); pm_runtime_disable(dev); hfi_destroy(core); @@ -379,7 +376,7 @@ static int venus_remove(struct platform_device *pdev) struct device *dev =3D core->dev; int ret; =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); WARN_ON(ret < 0); =20 ret =3D hfi_core_deinit(core, true); @@ -390,7 +387,8 @@ static int venus_remove(struct platform_device *pdev) =20 venus_firmware_deinit(core); =20 - pm_runtime_put_sync(dev); + if (ret >=3D 0) + pm_runtime_put_sync(dev); pm_runtime_disable(dev); =20 if (pm_ops->core_put) @@ -411,7 +409,7 @@ static void venus_core_shutdown(struct platform_device = *pdev) { struct venus_core *core =3D platform_get_drvdata(pdev); =20 - pm_runtime_get_sync(core->dev); + pm_runtime_resume_and_get(core->dev); venus_shutdown(core); venus_firmware_deinit(core); pm_runtime_put_sync(core->dev); diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media= /platform/qcom/venus/pm_helpers.c index c7e1ebec47ee..9e32ec866af7 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -486,7 +486,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) int ret; =20 if (coreid_mask & VIDC_CORE_ID_1) { - ret =3D pm_runtime_get_sync(core->pmdomains[1]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[1]); if (ret < 0) return ret; =20 @@ -504,7 +504,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) } =20 if (coreid_mask & VIDC_CORE_ID_2) { - ret =3D pm_runtime_get_sync(core->pmdomains[2]); + ret =3D pm_runtime_resume_and_get(core->pmdomains[2]); if (ret < 0) return ret; =20 @@ -990,11 +990,9 @@ static int core_power_v4(struct venus_core *core, int = on) =20 if (on =3D=3D POWER_ON) { if (pmctrl) { - ret =3D pm_runtime_get_sync(pmctrl); - if (ret < 0) { - pm_runtime_put_noidle(pmctrl); + ret =3D pm_runtime_resume_and_get(pmctrl); + if (ret < 0) return ret; - } } =20 ret =3D core_resets_reset(core); --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519482; cv=none; d=zohomail.com; s=zohoarc; b=McQhiBcK3dZ0Tt94lZdCgbkdyDZRL/TVLbLcuEgB81ozS2kwcGmFv1j134+xb6DojU2vovsRqqk/j2nKokBe4I5Adj9/UgcbasTBQ2aii78wFAMsIg+zri/qc50ZBmLOWIiBk1iJxX4kJNK2IssfwPQW0qRPcvh1igTYiPEMZlI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519482; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QhHrD2hdti/aHywgiNnSlUWoWC/BiCEKr+4+mhJkxmE=; b=CnCUZW8Hb4OJn1yqoYZM2RF1zZ2KWUByklb7UMT1PVfoCirkueCfIaGIcNFlDz5QSTOKypMbbMsylTyCxUSZeUfxPSaaJVnjTXiirb8RmzNlmX50+0KioYA2UATFx79ksJIsCV7n1gQQ0fb6xv9Ea21WcKXB8xUyPDwRehR1WTw= 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 1619519482633537.464062003087; Tue, 27 Apr 2021 03:31:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238361AbhD0KcE (ORCPT ); Tue, 27 Apr 2021 06:32:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:48172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235372AbhD0K2P (ORCPT ); Tue, 27 Apr 2021 06:28:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A00306142D; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2S-TO; Tue, 27 Apr 2021 12:27:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=73B6Lks3AupUDrJCPSyBZhCBhq2sPf760XjzihM5LGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fl9q1iE8eD01tbsHYEKRBJrPiuYXt3bYQA/8ySdxl389pDMPY+XfkkLCJNyMakTUH FVzL1mkUOipL3CgBo7DkEmqCzVlCvI4OB/2+6w1u9G3tvr21JGUMESS1Fy6mY6f1Rn GXHb16PBtHIUhiAuhasXCta12WJhvDME4nv0tz2yieLoiQn8sjhz8QVlIdBlmMfmFu JV3l23Ef3l7DEYI2CcWn5JjMGnWoIJ5/FvYOP2M78BPSZDtnCbGDGI4l1RvCVQO9LY vk22S0ah1EQCxe48r+LzsM8s+sKlaCAHWDTDuATsys9Pd54R7BlEhkeHUP92vESLXP 2MB+psIGAqjtw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 67/79] media: venus: vdec: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:57 +0200 Message-Id: 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/qcom/venus/vdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index ddb7cd39424e..347e533ea673 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -568,7 +568,7 @@ static int vdec_pm_get(struct venus_inst *inst) int ret; =20 mutex_lock(&core->pm_lock); - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); mutex_unlock(&core->pm_lock); =20 return ret < 0 ? ret : 0; @@ -601,7 +601,7 @@ static int vdec_pm_get_put(struct venus_inst *inst) mutex_lock(&core->pm_lock); =20 if (pm_runtime_suspended(dev)) { - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) goto error; =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519510; cv=none; d=zohomail.com; s=zohoarc; b=Ow9NHEouBSW+9EVlLSjPj6VpJD1JjGJ5vo5u0WizoLSvnljQKu9QSpMQHEdI2rBU6MPnFjUv/RBqu3C+wkL+IbUPutOp/c7OwrHlje2ZFRI9t+3TgKIbR7J2xy6Lb2YmELwSmKhPAOoDT7zjAbEEs2FcAnliLcPv3CoPDj+Isw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519510; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qFTRVUszSqQZiO25RZUrlPtLj0Cai3UhhBIBPa+fAFk=; b=NOfqEqm+e6xdQ2ElJj84AHKsRl2fdBaRiZlR9dUW/r4WQLakJWp5RFw51deMdjyGPwolkvuDWE+Mp8swWvI6t3lTqBZJEinLANP9yf4j4vSuJila91D0ziGn2MRy0bqDw0zNZ0sBY5RT/iBLY/3H2wJ0kUr6xDBj7Iwc9xdmS1M= 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 1619519510099568.34724732859; Tue, 27 Apr 2021 03:31:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238331AbhD0Kcc (ORCPT ); Tue, 27 Apr 2021 06:32:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:48288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237270AbhD0K2T (ORCPT ); Tue, 27 Apr 2021 06:28:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9A2676142A; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvy-000o2V-WA; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=phIvrsjCST0hqKSIzsjBL4/Aigr4NLUZL7GWQhPHYlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pAB0gi60sdZ9uYUw3agDuR9ReaHY+Z7UzbIXDbL2xV9MXGbg6lcJzDK7yQbtRT8tz AETzY51R4DOm2qb5wHrqf8qTnDen3mBfPHoGPhdQSe7VfRtwOZpDi9H1n3MdKyHC0F lbqsFUmuFWmR5oDnRXXCyRQswjJp08X4HB/p/cnMZwSSqHCofsfd6+OnP1zNAf2zhR g3xZtqfOXc61u2q6KL47/h0POI8SR/CgbvDoC+SRiCwg9MPBPlB8fDmYK5ZWA3LdJi h8hiYOLRPEZ97SaBJdy2UfeaqJfbE6vdPxBuVvwvsIQ6v4qN+EOQghS2gNQ+Iy5UjV dkmQC2Utz3bMw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Stanimir Varbanov , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 68/79] media: venus: venc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:58 +0200 Message-Id: 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/qcom/venus/venc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index 4a7291f934b6..8dd49d4f124c 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1205,9 +1205,9 @@ static int venc_open(struct file *file) =20 venus_helper_init_instance(inst); =20 - ret =3D pm_runtime_get_sync(core->dev_enc); + ret =3D pm_runtime_resume_and_get(core->dev_enc); if (ret < 0) - goto err_put_sync; + goto err_free; =20 ret =3D venc_ctrl_init(inst); if (ret) @@ -1252,6 +1252,7 @@ static int venc_open(struct file *file) venc_ctrl_deinit(inst); err_put_sync: pm_runtime_put_sync(core->dev_enc); +err_free: kfree(inst); return ret; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519472; cv=none; d=zohomail.com; s=zohoarc; b=RkTwT1rpFBQ34i05FHim8HOa5oAQXkGTJ/1jUPNi5KlSyb/d2CH4VS8F0XmUh1oJHcIyoTbu4R9zo/w7WyObm0QOrdLzGvJ0XJMbr6mL2SpkmikEpi7jD8uuaOD9tDzyP0wiyCMnLqUlDSRDi/IcxW5/kpXtZNDCMObsQjXiK8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519472; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TnDDcu0/VpIALreZ69WjY+tB1POKhwvc9twQVcOW+RY=; b=SB6MyY8fILcdL0SE87xWPXdf053RjaujwzBWxZF3M4Prk3K+G7WIQFGiqinEt8qH8iOkiMYI0tIhrFykUVknd6g6maP1FqrpdxXsXGgTr3wKX/Oac8j8wZIB7OqBHURItQ2G2WSaG9FfjuLGg5ugXd8l9/Rv5MANWXy/0ZzrD5A= 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 161951947248722.439435722659255; Tue, 27 Apr 2021 03:31:12 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238646AbhD0Kby (ORCPT ); Tue, 27 Apr 2021 06:31:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:48152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235777AbhD0K2M (ORCPT ); Tue, 27 Apr 2021 06:28:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B0DA6141D; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2Y-5O; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=4l0wYnfzYi1h956EsgOdlzJmS/W0qfvo5eSm9fSkn9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OgcqVxZPSgZY7w2zf8AmOvN23IiVtNmHB0YnDlrUO11w4OUcFW7xpl14zNN3ExSWK dLxQgyBtbZ79yz8XwJt1UHId/8CNpQPc3urkAieF/tMtUo8BgyrnCDvYJY5QuFr3pM WGiO6sU7NfgoLkkYw4gwdlXLfz8ym4BB+GJBQWdZLmepKvlveH+YED92kXRrZhWvHG YuDZlkb4QoDymTVgSrY1YYQTk6DsoXSIySWrO7/JdBjxsdnld9sOztceHLI0mzwgqg hyO4fRQhg1f98yyMXxN9yxy4r2Jd2ky0zZu2Ktedyz0acVbS8i41MnnBIS/0pCCUD/ 1u6AdDcgUsrTA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Laurent Pinchart , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 69/79] media: rcar-fcp: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:59 +0200 Message-Id: <912eebdb622ebcf20c7c8887ee68b9e5a5201cce.1619519080.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/rcar-fcp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rca= r-fcp.c index 5c03318ae07b..de76af58013c 100644 --- a/drivers/media/platform/rcar-fcp.c +++ b/drivers/media/platform/rcar-fcp.c @@ -101,11 +101,9 @@ int rcar_fcp_enable(struct rcar_fcp_device *fcp) if (!fcp) return 0; =20 - ret =3D pm_runtime_get_sync(fcp->dev); - if (ret < 0) { - pm_runtime_put_noidle(fcp->dev); + ret =3D pm_runtime_resume_and_get(fcp->dev); + if (ret < 0) return ret; - } =20 return 0; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519463; cv=none; d=zohomail.com; s=zohoarc; b=Dg020tscffCs1qhgk5ong5XJy5+Hj3oJTKNTXQUdxSYe/8JBfs+lISsKjPSJPjzg+1fhUvq3dvHXJpzfij7IRk4YoyNXAWB0kgXVl/Q9/Uez8ruvaqaAg9fIrys3+RnVtAVInT3AhUTToGzqI9iOTQrMs1/Gq7rPoWH1x0Ljv4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519463; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wNlWAJheWo8r305lpFRr+Xmq5CAdeEepltQZlmQJw8g=; b=Sj+uYRmtVy1ncunpmwmrSTKhitP4f74nHH1ihGFS0fq5uIJiYrHC6nwMGsPVkZAJKCpsouucZ/BI9lmhHOympKPVGTnIU3uY6SCh9rJtXDig1T4p5/QBk/2Zwlmfxb9Rma+6M5L17Nr+TUym5bdy4p9ihyjyr/NdqdTMPvNv5iM= 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 1619519463342979.1783772607264; Tue, 27 Apr 2021 03:31:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238391AbhD0Kbp (ORCPT ); Tue, 27 Apr 2021 06:31:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:48256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235783AbhD0K2M (ORCPT ); Tue, 27 Apr 2021 06:28:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 87AC76141B; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2b-7s; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=rChg/pXG2Qjbehywcb/+z5hE6+LFH66GvNnoCtLFEBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QoTamJiO+JxWdt3o4Hs6vYrg2jgI81cjPn/kT0glZGbqmWBM9aOjPXJVl8cyWQmQy 26cQBTSG214To1rzhZwxEd8DWaeNPXaYCPNgx9TjugtyzxzqP17ni7VfGq7JyR1YGt eluVYYOH8buCEmvbeDPmH+SnnxwSJWplGFoFQrxxCI9hutBi63CEyGn6RHjyNcmng8 XOQDYhQy3IYrSTx5pqC/lwZGxHm+ZoMJ/+a3ms26yWuqp5hKZpmOQZhbIVa71JY/AP +H+DNnw5dL0SKM/yN62bnrs6zSaJHLl64PNMQR3QGkuJI1GUGG6sLkl/MVozaGldFl WaHNIK2jM2a8g== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dafna Hirschfeld , Heiko Stuebner , Helen Koike , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v3 70/79] media: rkisp1: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:00 +0200 Message-Id: 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/rockchip/rkisp1/rkisp1-capture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/driv= ers/media/platform/rockchip/rkisp1/rkisp1-capture.c index 5f6c9d1623e4..3730376897d9 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c @@ -1003,9 +1003,8 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, u= nsigned int count) if (ret) goto err_pipeline_stop; =20 - ret =3D pm_runtime_get_sync(cap->rkisp1->dev); + ret =3D pm_runtime_resume_and_get(cap->rkisp1->dev); if (ret < 0) { - pm_runtime_put_noidle(cap->rkisp1->dev); dev_err(cap->rkisp1->dev, "power up failed %d\n", ret); goto err_destroy_dummy; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519457; cv=none; d=zohomail.com; s=zohoarc; b=aXHe0We1w25T8mQdFdFmCmyC/IhrKz9TNMlbW4r0vPidM4MvOfqjNJ0lS1wsMDTwK4ewSM58U9RLQGpBJ5R310xCWhPadLb5Xh0Zx2Fm0BMwWQwoKteVyOOnLBDx7Qwx7f6BPLYqDL8lq8sT5AVBwJML0YiItELrLqOPkBo4Lj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519457; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=63AtnkpOqrycgwhgC9BpeUaU3jzUP88EBymuwKnRx08=; b=gjk4Dnyr7PRjxpq1sS/lsXvEVF4B1NcMDXrPT3lnomDS8l9rHYLNXhaMP8x+5WM56VGu8PRHkKhROIN2KAFLlT2RB2x+w3a2CVYJPRH2yg5ZFgHw0ZomGF7fi+9p78ZqqcFsIHP1cK7anMegBT1UvEC7j3SaiH5yPWA+jDXHpa4= 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 1619519457510567.4565507115526; Tue, 27 Apr 2021 03:30:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238195AbhD0Kbi (ORCPT ); Tue, 27 Apr 2021 06:31:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235801AbhD0K2N (ORCPT ); Tue, 27 Apr 2021 06:28:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 879436141A; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2e-Ae; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=ORhYQV8MaIIM9QGoq0fv1DmSrG26N8/lfMtTN/XnDlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWhEtfBuU+iaPtnpecEP0/LI/jxA0WIo9UTWcclJRH0K/NYiL0rpx0ZCJqAqEidOh A8g8d/0AYZ7JTWk+F2JB1pRmu1V6S/XCVwBB7Ttx7+6jszFrpe4ayC1iFofaxBHdfO Z+x4SQrf4i3+kzw8Y3EtBzSXkErF+7Xc0bGFa0h2WON+lrYp4KFfiwPNCFqidCIEkf /8iWl6LHQyyHyp0amqj/ybGl4nY3XMQ75Evnv8GdnZVT03GZflQAedFi4Aq9+9dnXx nIjn8sDYBGCIHzaTp9P56yId5WtHuboG5ppVXJiooSS1eS+YwvVY5FgACQcUGYvx+a MEYFMd08CI9Eg== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Mauro Carvalho Chehab , Sylwester Nawrocki , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v3 71/79] media: s3c-camif: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:01 +0200 Message-Id: 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/s3c-camif/camif-capture.c | 2 +- drivers/media/platform/s3c-camif/camif-core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/med= ia/platform/s3c-camif/camif-capture.c index 9ca49af29542..62241ec3b978 100644 --- a/drivers/media/platform/s3c-camif/camif-capture.c +++ b/drivers/media/platform/s3c-camif/camif-capture.c @@ -547,7 +547,7 @@ static int s3c_camif_open(struct file *file) if (ret < 0) goto unlock; =20 - ret =3D pm_runtime_get_sync(camif->dev); + ret =3D pm_runtime_resume_and_get(camif->dev); if (ret < 0) goto err_pm; =20 diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/= platform/s3c-camif/camif-core.c index 4c3c00d59c92..e1d51fd3e700 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -460,9 +460,9 @@ static int s3c_camif_probe(struct platform_device *pdev) =20 pm_runtime_enable(dev); =20 - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) - goto err_pm; + goto err_disable; =20 ret =3D camif_media_dev_init(camif); if (ret < 0) @@ -502,6 +502,7 @@ static int s3c_camif_probe(struct platform_device *pdev) camif_unregister_media_entities(camif); err_pm: pm_runtime_put(dev); +err_disable: pm_runtime_disable(dev); camif_clk_put(camif); err_clk: --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519550; cv=none; d=zohomail.com; s=zohoarc; b=B+8T0uWF51w/W3DEVyAriNLgjCCmlJlgQaeG4EB9XONGuy4SPO2/XsSymNzZd99bmf9CGcQgWwcIrIXFf+MCO3gN9v/sjrdbi2zQ+0aXMIJpJ+n0MdznofyIz21ecVkHiQzf61vhqUgvC5ohU7wRvlhQmGvGPWpt1u0WU5Kl6K4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519550; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UuREguUnWtJMEbW22CUBV5mbM3OEKqZjCmRLeRWME90=; b=eqKur6qT/gMGqRTuLl9OebuR/Q7x5n5reAQWSumL3TXmYhi5d728ww0iQ4cl6ekelCtXncPNGM+T7T5kj1KsMk6qLY8sGXjfuV9Ta8JNgfYMVLmTL49EmIrgKBwsQKkRdcGBqruJ6BFd4HNz1MkwP5iGJPmKlt1oq85aCXsplFo= 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 1619519550116277.2521521304416; Tue, 27 Apr 2021 03:32:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238724AbhD0KdK (ORCPT ); Tue, 27 Apr 2021 06:33:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:48256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237831AbhD0K21 (ORCPT ); Tue, 27 Apr 2021 06:28:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8752D61419; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2h-Cy; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519237; bh=GlCvanyZeZRx9KVkDMbg84X3Nl/epjQxFII8vak4mR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRuN6RmqcFQodREOCRy+jAcix/qZjUy416To91BdxH5zMoHBcQmajEmfcEo6zn/MV phXYNvAGOksmNSCVaFYle9I0HA7uZN26uSislFBXRhQwtl22fl/PNT5MnL/c6IDOvg DRYKld857KFGysrlb5dBhBZyQ8hsFcWZwmVxc5nE2iJddSdgjGfbxAI4kQGVFQLr6H klaPwaqqIHm5czFctc9hMQrrfr+QmZDLzmg/2PyNR9x0qsFnEBoQuEwWsygAqTmciH CrkkScMkh9ds1nVM6h72+WHtIEv0DEs8v+ub9VB9d2+s7kRdWLtOIbqNaUwQtdvY0l C8xePLL40BXPA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Andrzej Hajda , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v3 72/79] media: s5p-mfc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:02 +0200 Message-Id: <828322e0f8b06ef2962b64a6f6f1b368eaecf7a0.1619519080.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. Reviewed-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/pl= atform/s5p-mfc/s5p_mfc_pm.c index 62d2320a7218..88b7d33c9197 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -78,11 +78,9 @@ int s5p_mfc_power_on(void) { int i, ret =3D 0; =20 - ret =3D pm_runtime_get_sync(pm->device); - if (ret < 0) { - pm_runtime_put_noidle(pm->device); + ret =3D pm_runtime_resume_and_get(pm->device); + if (ret < 0) return ret; - } =20 /* clock control */ for (i =3D 0; i < pm->num_clocks; i++) { --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519449; cv=none; d=zohomail.com; s=zohoarc; b=ArUiRMGBKS/mBZavHKrawVvGO+ehboDVjxssYqDWdwlevRmkPUfhLlGhlf0+zqTVNC8pQ7wJjE+/r0mQ2v5oxS+Jz8GH/DITbRU/Q5IzpqXleNAp8VZ4FJUvLNqE5qHh45wA1m+CDQEXR1xXf/pTmLBGhC4/s7MyCl/u8QzdGWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519449; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sgE3dj4dMaYUyhw2sD63gAOAxEhr9JpTC4MUmn50jX8=; b=EKa5Hij9uY63J40bWNQre3DqcvgC2JSIvtP2WbC8PqiIHmL7bLWGuQ/QzTmtS1suX6wcueZB6+cMatqJ1GAsyeDKmNP5EzsHR+VmfBZeYG6L3rsLr698kp8U+0+PXnbJ3GOYhw3LodRv+p9IHXijIJbuTEPWC/JH8klQbb84Y8w= 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 1619519449565510.4039113898217; Tue, 27 Apr 2021 03:30:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238581AbhD0Kba (ORCPT ); Tue, 27 Apr 2021 06:31:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235792AbhD0K2M (ORCPT ); Tue, 27 Apr 2021 06:28:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85E9B61418; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2k-FU; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=bbBhKTio+K3X9fPKV58F4G07rHzCE6SQVXwv0W77lPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlHMYxFLvME30+6y/MqOSW0DewpPTN7OJbCDPGac34ErBLW+sYVN/QeTOx1avkavs ANaJh4riaq3bTYna7eQEm/QpqkHC/jLJ8SuQtwlrBZysqgAMjpkYpj5q1p26KZO7Hm M8Nu/OJpxTlipsSygVg3OaccO+fL0x9uxWCzUtDnbyZLYeJ6NXrUK3Na9jLrDfT4VF AVDnHv3KZ0G6ntSjjpZUzWyQtE/MRB3vCMpCPvd4kj6WIa4pj6SmWakBPTt6FLSHL0 l+aghavwyXUwfBB456ZEBxWRWUN/NK8RA9das+8bebh5ONuTDjpAcdnPDK+do/pWY9 FqXjJ9E7HFqJw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Fabien Dessenne , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 73/79] media: bdisp-v4l2: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:03 +0200 Message-Id: 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/sti/bdisp/bdisp-v4l2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/= platform/sti/bdisp/bdisp-v4l2.c index 060ca85f64d5..85288da9d2ae 100644 --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c @@ -499,7 +499,7 @@ static int bdisp_start_streaming(struct vb2_queue *q, u= nsigned int count) { struct bdisp_ctx *ctx =3D q->drv_priv; struct vb2_v4l2_buffer *buf; - int ret =3D pm_runtime_get_sync(ctx->bdisp_dev->dev); + int ret =3D pm_runtime_resume_and_get(ctx->bdisp_dev->dev); =20 if (ret < 0) { dev_err(ctx->bdisp_dev->dev, "failed to set runtime PM\n"); @@ -1364,10 +1364,10 @@ static int bdisp_probe(struct platform_device *pdev) =20 /* Power management */ pm_runtime_enable(dev); - ret =3D pm_runtime_get_sync(dev); + ret =3D pm_runtime_resume_and_get(dev); if (ret < 0) { dev_err(dev, "failed to set PM\n"); - goto err_pm; + goto err_remove; } =20 /* Filters */ @@ -1395,6 +1395,7 @@ static int bdisp_probe(struct platform_device *pdev) bdisp_hw_free_filters(bdisp->dev); err_pm: pm_runtime_put(dev); +err_remove: bdisp_debugfs_remove(bdisp); v4l2_device_unregister(&bdisp->v4l2_dev); err_clk: --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519527; cv=none; d=zohomail.com; s=zohoarc; b=X2O6nc0W8mn4iF2JZbsGv3oeGCF6SFJIn9szT0DEBE4FOAGzXFR6lflDdUrSt54lcYb1+clGacHpw8coAuYz18/dih80LljIYaXZYRhcvuKGAOaPaAE/JeGDjGG+NLVNdYH9vqbPhi8ndV4+E6htxlJ/6I1sdEdSQS33SHdKZEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519527; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VMvfSgnn6oSyhENzNZN7g3TxreG2d2E/GvlVbPp4Nxs=; b=R+fRDoLVYTDfevzqWYYG/iSsQfDUx2Ld6pX77hkigKlqb//KV4uq4LBtRLsYE0t+twiS+4Oo2ptBVlV3z1C0mBFTF5CT/nunW6vwkNrsHDRGPhfo71JukvN3rmj9F97YxWubhYwr6Ra/tswzh9r/hf7CTat4wEF2KIerBv/1kdA= 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 1619519527476684.2600004304848; Tue, 27 Apr 2021 03:32:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238322AbhD0Kct (ORCPT ); Tue, 27 Apr 2021 06:32:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:48204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237609AbhD0K2Z (ORCPT ); Tue, 27 Apr 2021 06:28:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 815A661415; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2n-Hp; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=/R60wucnhMxzatTcaaq6aX+wA4KyHRrla+Ogrsx7GxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P56zrL4Gg3jEUeTkZS2IFHj+uXqtpdhmLsJDUn92MY4jLzJjsQAryX6b1IuA4GpoC uiZVc1R9FxNaZE3nN2cCyZR0UT5MeNcBNUzscwoou2kUKoy+tWYKD1dG8VBteaq506 pIOcETXuU9PPpieZnMFlvj8nlszSsVh7Ty5l5thsp1lnQoM42oV9QGL94uNwZanFzZ EAipNbg4MFY7UlZWA3zXP3lxC3IeJxVDBrA121JQ14Ki3F0PsoxcMrpDJEnKDwRzmR QehK2z7aUj8zb2mpo7fTfROvJdt3jaPNmBdKvwFOtLjtKycARv1ZOUIaV88bhGhzyn 5xBT36E1ppv7Q== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Alexandre Torgue , Hugues Fruchet , Mauro Carvalho Chehab , Maxime Coquelin , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v3 74/79] media: stm32: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:04 +0200 Message-Id: <7a01ab8c03a6778c6aeb9357a3807829c6dc91f3.1619519080.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/stm32/stm32-dcmi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/plat= form/stm32/stm32-dcmi.c index bbcc2254fa2e..5f4e1db8cfcd 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -723,11 +723,11 @@ static int dcmi_start_streaming(struct vb2_queue *vq,= unsigned int count) u32 val =3D 0; int ret; =20 - ret =3D pm_runtime_get_sync(dcmi->dev); + ret =3D pm_runtime_resume_and_get(dcmi->dev); if (ret < 0) { dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync (%d)\= n", __func__, ret); - goto err_pm_put; + goto err_unlock; } =20 ret =3D media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline); @@ -848,6 +848,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, u= nsigned int count) =20 err_pm_put: pm_runtime_put(dcmi->dev); +err_unlock: spin_lock_irq(&dcmi->irqlock); /* * Return all buffers to vb2 in QUEUED state. --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519538; cv=none; d=zohomail.com; s=zohoarc; b=VsP/rBOXdJoddzudcMvVGHfXG1Xn20AfyQwoI3Y9qkksKxDHsFGKj3UxpnSbwxXMWmbR7k1tgbkUIQxrN2HLfvZt0pvw91armh+hLi0TIG3sgmCFO4HEcQH55eZD+ymdGWaTMObhlE3jXe7OA42puNCr37i4szCYPnj7W+Fg4CM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519538; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ibdjOd74zn5QWbuSye9o2gRXEdlT/fUXvhYWQjU18O8=; b=WvChRP2Xy4aQi4kcQgsQ9E7C4P4vsM2bmFglhp8sBJkY/j1/KK6T0VltWo/935rOQhG7UDWsOOqAFPOIoyaKvZFxpwkBP/nZUnGTdAqHlgGAW5VahOiiodcrwrW91SKL528SIjErkp049ffqjy9WIjH2WeowMLXXyv+tdMDJfgU= 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 1619519538822620.252286335319; Tue, 27 Apr 2021 03:32:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238614AbhD0KdA (ORCPT ); Tue, 27 Apr 2021 06:33:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:48246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237792AbhD0K21 (ORCPT ); Tue, 27 Apr 2021 06:28:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7FA7661413; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2q-KC; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=Q1WsziPcbnwAb2cpqQFZbO8zttZnZQq1oIpn6yJZI+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=unDnKlP9o6a+vxQh5qp31nQEN88CtW9mWtX/Ua4La5wmjMW1KGY78blmf7pj1Wyzu qOd5WCV5sohjttf/sTUtf/TFTmUB7bVJS60pepQ3fMX8QkcX166Y1a0xMCkZlVDm9g 6FK7Q97cE9jt2NrzFL1Znnbw60l7ea7hOWisMYSG1QCZV2IVSqS2r62lZ5FWloprq5 ubcfvLclPeOS5Cr6TkAs9PqHcykmOSm9xjyMvLsp+5caennZjML9l+hWjfMbDF2j0n Z9vVkjalJG50mw6RGDcTxUSSfXV+z9OBGleyf9GzxMqu0VvA3W0f3PyAI7IG/GmKoN x8KFr3FfvGuZw== 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 Subject: [PATCH v3 75/79] media: sunxi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:05 +0200 Message-Id: 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 From nobody Fri May 9 23:02:07 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=1619519445; cv=none; d=zohomail.com; s=zohoarc; b=NRWw2nXXqC4uNJUNWEM43/cu6wdVPnSc44SNEbdhlj6Axy+JTPemBb51E+lwy2OtjuhHk/gDceFyxJ0OkXTLLPtvqAJ/zuPhP3DyvHMq1wpInDvNyjElajj/7vY1bSSz///oLkPP56HzVQvhIcn5lZaNvQ4P+nVtjzm1rkC2nGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519445; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=12KRzueB6SAQP7as6alJYowk/8pupz0I32OophPzn48=; b=C1+gk0/HaasiZaPqIRVABgqjD42jZ/mL7Dxvo7wh5Jm4aj1aMUHLps7GjHus5hK+BjA9qgKn5fzqmtQqWOlsPdG+2Dt2h3577R3LYEN2RyHgDdxUzDv+S2ZZit6ZS89AUA74I7a+REaXtOO7qIStzhGqHz1PcqrnPaeEruSfoY0= 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 1619519445682629.5706441560494; Tue, 27 Apr 2021 03:30:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238467AbhD0Kb0 (ORCPT ); Tue, 27 Apr 2021 06:31:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:48270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235804AbhD0K2N (ORCPT ); Tue, 27 Apr 2021 06:28:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7694661410; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2t-MZ; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=DzFwWWrx/K8GcHK3QK7SiLSCre5vWmnzlplRbKVIaVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GgBONKa6p/I1DeV6DrdT75QQGY5WBAGnzAKp35ybnJUFqoehBmAXoSYjNmGEEGA/9 QB7SR2N17xCHH0hJs1QIeebKGEqR/Qvu/b0LDbw+4mq8glVdePVWjbKvgD7oIyvRVK DU69zKoixkrtwlnNLXIQ/8ZUOWwWjrRjiz9AdH3JIrf3t3qDgFeQelb6nmHRin4IB7 gVFzDj16QuJoRpuFnVrWvnJ+w6bXVb/wH3fDBEsAFuRg/jbjL/+entqkTIcFYkeFYh lrpgPbYAVSv9Ad0ix4Ca9rrOqUhaju/8KFRyfvJIjc7bmCiFSnOmF350OpELErO7MD oCSw6I0Q1H7Aw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Benoit Parrot , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 76/79] media: ti-vpe: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:06 +0200 Message-Id: <163e79c9b888f5677fc30150918abdbdc9085b65.1619519080.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/ti-vpe/cal-video.c | 4 +++- drivers/media/platform/ti-vpe/cal.c | 8 +++++--- drivers/media/platform/ti-vpe/vpe.c | 4 +--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/ti-vpe/cal-video.c b/drivers/media/plat= form/ti-vpe/cal-video.c index 7b7436a355ee..15fb5360cf13 100644 --- a/drivers/media/platform/ti-vpe/cal-video.c +++ b/drivers/media/platform/ti-vpe/cal-video.c @@ -700,7 +700,9 @@ static int cal_start_streaming(struct vb2_queue *vq, un= signed int count) =20 addr =3D vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0); =20 - pm_runtime_get_sync(ctx->cal->dev); + ret =3D pm_runtime_resume_and_get(ctx->cal->dev); + if (ret < 0) + goto error_pipeline; =20 cal_ctx_set_dma_addr(ctx, addr); cal_ctx_start(ctx); diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/t= i-vpe/cal.c index 2e2bef91b2b0..76fe7a8b33f6 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -1024,7 +1024,7 @@ static int cal_probe(struct platform_device *pdev) =20 /* Read the revision and hardware info to verify hardware access. */ pm_runtime_enable(&pdev->dev); - ret =3D pm_runtime_get_sync(&pdev->dev); + ret =3D pm_runtime_resume_and_get(&pdev->dev); if (ret) goto error_pm_runtime; =20 @@ -1098,10 +1098,11 @@ static int cal_remove(struct platform_device *pdev) { struct cal_dev *cal =3D platform_get_drvdata(pdev); unsigned int i; + int ret; =20 cal_dbg(1, cal, "Removing %s\n", CAL_MODULE_NAME); =20 - pm_runtime_get_sync(&pdev->dev); + ret =3D pm_runtime_resume_and_get(&pdev->dev); =20 cal_media_unregister(cal); =20 @@ -1115,7 +1116,8 @@ static int cal_remove(struct platform_device *pdev) for (i =3D 0; i < cal->data->num_csi2_phy; i++) cal_camerarx_destroy(cal->phy[i]); =20 - pm_runtime_put_sync(&pdev->dev); + if (ret >=3D 0) + pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); =20 return 0; diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/t= i-vpe/vpe.c index 10251b787674..07cb2c140295 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c @@ -2471,10 +2471,8 @@ static int vpe_runtime_get(struct platform_device *p= dev) =20 dev_dbg(&pdev->dev, "vpe_runtime_get\n"); =20 - r =3D pm_runtime_get_sync(&pdev->dev); + r =3D pm_runtime_resume_and_get(&pdev->dev); WARN_ON(r < 0); - if (r) - pm_runtime_put_noidle(&pdev->dev); return r < 0 ? r : 0; } =20 --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519468; cv=none; d=zohomail.com; s=zohoarc; b=dhUwcj9/eUpjKc9HHonro5U5dO2GRplAc687o6slWPJC6ltrXbh3R6HDMvn7ShxhKj7iuy8RUoD1uCUgWkOhKGlSiQe4Ab2deBtFRBog8NO2qG34lfA/5xSKEPZuLgQvsd+258h75GftyAyLDWOLM0NCvtroL5cJ5teZJsAjSWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519468; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2v9KmEwd1C/MzAQ5N3HPIngKwEpL5FhNSeMj/4vi0JA=; b=VlXqDxAQ0zYQKTGcW59nDVEepphPIK2dT1YstAA47/lZ5iMr0FrnntKtkmD8TSDtKAmDP9tsNauaOufAQKflU0lLk6pSV9y2NdQDDxXFPy9TF9vB9zG2wmmFJWW3ngkqihcLUgbOIAtUhXohELV62olVdRg0g7VwOIfxb6Cbnc0= 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 1619519468876699.1835498310242; Tue, 27 Apr 2021 03:31:08 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238355AbhD0Kbt (ORCPT ); Tue, 27 Apr 2021 06:31:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:48138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235770AbhD0K2M (ORCPT ); Tue, 27 Apr 2021 06:28:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 73FC66140F; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2w-P3; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=HzlriyHzqlZAHsYOJEVourXS9CSW2DolwRX6O+Dbyqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HxVP4KEkcKlNvIkQOkmBxLuatgvSRun1ZqFvIYnxgCB/3a7y570rBkCO09tODIHe3 ZE9I2P7BPtdg/pzsuKQ48T9XwJlMQ/RvX9MIHqQcjTlUnGR6ESI2k2CRiYxjbg7x33 SgNWhDzVC/jQ1yxmFFgrj4hGryrt0y+GFNjyI6n9YhGwtT5A7fHIR31ZlIv1FU1YE+ ZhUXWPCLN0eyqiW/xAARYZsg2AZzVNgQUQb7EqGjNNWSUstlHqHnt44+86lbmdUTLS Pt/K5vVh6gI61Bpw+wJ8zDMOaJEtKZf1Z4zVwq005d9Uf2VHRk2kL9O8FnGl8YPutX QYPVLG6GBYJLA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Kieran Bingham , Laurent Pinchart , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 77/79] media: vsp1: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:07 +0200 Message-Id: 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/vsp1/vsp1_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platfor= m/vsp1/vsp1_drv.c index aa66e4f5f3f3..c2bdb6629657 100644 --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c @@ -561,11 +561,9 @@ int vsp1_device_get(struct vsp1_device *vsp1) { int ret; =20 - ret =3D pm_runtime_get_sync(vsp1->dev); - if (ret < 0) { - pm_runtime_put_noidle(vsp1->dev); + ret =3D pm_runtime_resume_and_get(vsp1->dev); + if (ret < 0) return ret; - } =20 return 0; } --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519433; cv=none; d=zohomail.com; s=zohoarc; b=S2FZG/9YBjTY4FIrhylJPN4C8JsaipQlfj+R8PgO0jNWMpjPw4RUtAjeSYqZ2m6Ibxqy3X2F3RCBFjqHhVPOVJ3ZaRQSJ6RSV4LAW2IlhGW/gRe8fXS7GUSgwaWs0f7fNmSjJqCoQEObGO0hxhA3DYeZMQ3KUrbgg+G5U/as6sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519433; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5dPM+MMJi6B5zr4FfEOOo5bEOoO0UyNbs0h6pLJ4EXg=; b=kZ9DZ/fncx9P2dxWYJuK0/VSyqimuDCwsZ7QNkTUv8LpN5tKdgdO05aLvN/Wpx7OrEZV/YSd917Pt/HMg0bAiHCLS2P+xUd3GHxJFUU6E7W5qnh+Pw5BasLZVMyXeRy7sRdrF3MiE7NKCQ54FhFeWjqDBTZR87wmfGBfly4X/+A= 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 1619519433400489.9444255769374; Tue, 27 Apr 2021 03:30:33 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236816AbhD0KbL (ORCPT ); Tue, 27 Apr 2021 06:31:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:48204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235736AbhD0K2K (ORCPT ); Tue, 27 Apr 2021 06:28:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 710496140C; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o2z-RN; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=ef7IZ30lWjyFTV9EZRM5TkDA3zgk8AfGs9/mdIqlXQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NnefXPyXnuIWijAghbwvELrHTqlZiXq/Qbhds+I7GeJnKGtoCKf2ygzYDTZNy6YJH 2luLrgK+JSAXl1nhkLDiBsca1EOO6cDy5SY0dOwxcHCwLS6IB31X3GKE3T5EG+IOAC UZOd0/61C+DeJfvW4H+JlCKDxW34nCrPW5kY51imcJFadO5LSDFMeOXnjvxkkQy/6C uiCsJ48DrsdwrcUyjBvJSJaKKHfhV6K5AxCB7dFvwwrwWy/hCKIRliym7/4UfefdUp I9fQBOjuLGVs1afchnLn2NrNZ0ISkkx9umhOZnksf+PUBatrAPl6u7Y/6aqvxFbsxZ PciS3pLnkJ+iA== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v3 78/79] media: rcar-vin: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:27:08 +0200 Message-Id: <85d92ba9e709ef00673a3e0e11769b121745e9cb.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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) 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. Reviewed-by: Niklas S=C3=B6derlund Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/rcar-vin/rcar-csi2.c | 6 ++++++ drivers/media/platform/rcar-vin/rcar-dma.c | 6 ++---- drivers/media/platform/rcar-vin/rcar-v4l2.c | 6 ++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/pl= atform/rcar-vin/rcar-csi2.c index e06cd512aba2..ce8e84f9e3d9 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -408,6 +408,12 @@ static void rcsi2_enter_standby(struct rcar_csi2 *priv) =20 static void rcsi2_exit_standby(struct rcar_csi2 *priv) { + /* + * The code at rcsi2_enter_standby() assumes + * inconditionally that PM runtime usage count was + * incremented. So, it shouldn't use pm_runtime_resume_and_get() + * here. + */ pm_runtime_get_sync(priv->dev); reset_control_deassert(priv->rstc); } diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/pla= tform/rcar-vin/rcar-dma.c index f30dafbdf61c..f5f722ab1d4e 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -1458,11 +1458,9 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u= 8 chsel) u32 vnmc; int ret; =20 - ret =3D pm_runtime_get_sync(vin->dev); - if (ret < 0) { - pm_runtime_put_noidle(vin->dev); + ret =3D pm_runtime_resume_and_get(vin->dev); + if (ret < 0) return ret; - } =20 /* Make register writes take effect immediately. */ vnmc =3D rvin_read(vin, VNMC_REG); diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/pl= atform/rcar-vin/rcar-v4l2.c index 457a65bf6b66..b1e9f86caa5c 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -870,11 +870,9 @@ static int rvin_open(struct file *file) struct rvin_dev *vin =3D video_drvdata(file); int ret; =20 - ret =3D pm_runtime_get_sync(vin->dev); - if (ret < 0) { - pm_runtime_put_noidle(vin->dev); + ret =3D pm_runtime_resume_and_get(vin->dev); + if (ret < 0) return ret; - } =20 ret =3D mutex_lock_interruptible(&vin->lock); if (ret) --=20 2.30.2 From nobody Fri May 9 23:02:07 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=1619519484; cv=none; d=zohomail.com; s=zohoarc; b=UczqeWYS1PhzdmJqYlNyympyW/bz0IwFRBtUJ8MTR8Nd4J5XB48ON3W9GQseSDHpHc34o+KkMjgzTaIHPsPKSVIitBsiyYZ0DOPkLx9S6fRtzov9dcqSulcW/HGg0juV8wjro7+nEsBRi2srXgWV7rQWNiFtyqqNJ8zzbGxa+Bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619519484; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6aHqXZX0GvEv8M689VN0ZTC03Iuok2m3bZyU4jw0V6I=; b=K1U+VIKRx9dJlTMoD0luosaLqSKYuKqYkXJznlPGN8KNbmHAkXv7WfbF8g0OKY2WWTKLwh0F+DKmWStFg0JQGAitWnzT2vGTklLHghB+dZv/RjuNWqlQ0bm4F51Dw52sq/TuVccsDYVpWLqQxgTbTv6W47X+64pdId3fpPCZ2SU= 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 1619519484150192.84164312903135; Tue, 27 Apr 2021 03:31:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238550AbhD0KcG (ORCPT ); Tue, 27 Apr 2021 06:32:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:48278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235976AbhD0K2P (ORCPT ); Tue, 27 Apr 2021 06:28:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 735A06140E; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKvz-000o32-Tr; Tue, 27 Apr 2021 12:27:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=9XhzsT7qorzb0O8m+AZfDrHyIqnxWFrm1sswMUzcdRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tf914diWBrl8TDvXMl5MLXGnXhoS7XUaWw5QGfh55jhiWLbSpRdpvTzlw8J5UysaU jBsXLJJNXnvdzEzd5UuC4JNMdgz4Apn3uggzXUulqA7iTvZjqMwLrpDUy+UTJpIQhv CJat0sLmS/XVxjPR6B8gwIlB9aLieQI8PheQt35mTD0a1cGmLmk4t8ULtrwmgoC5IM L2Kld2gSrXRUa4stHtOpUh71/ja/dRGVRGLemrB7h8mI4q9pGNcLH5eAlrasCDTiqe h6f3S7+apWzvZimwh2HHitnK1E4i7y2E1fPmelY7kH7j9cnMhxgMb1CmXxl63Q928Q l8vs9Z0HYh9ig== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Ezequiel Garcia , Greg Kroah-Hartman , Mauro Carvalho Chehab , Philipp Zabel , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v3 79/79] media: hantro: document the usage of pm_runtime_get_sync() Date: Tue, 27 Apr 2021 12:27:09 +0200 Message-Id: <230f22170db7fa57b49cff4570cef15bf11b2ad5.1619519080.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" Despite other *_get()/*_put() functions, where usage count is incremented only if not errors, the pm_runtime_get_sync() has a different behavior, incrementing the counter *even* on errors. That's an error prone behavior, as people often forget to decrement the usage counter. However, the hantro driver depends on this behavior, as it will decrement the usage_count unconditionally at the m2m job finish time, which makes sense. So, intead of using the pm_runtime_resume_and_get() that would decrement the counter on error, keep the current API, but add a documentation explaining the rationale for keep using pm_runtime_get_sync(). Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/hantro/hantro_drv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/me= dia/hantro/hantro_drv.c index 595e82a82728..96f940c1c85c 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -155,6 +155,13 @@ static void device_run(void *priv) ret =3D clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks); if (ret) goto err_cancel_job; + + /* + * The pm_runtime_get_sync() will increment dev->power.usage_count, + * even on errors. That's the expected behavior here, since the + * hantro_job_finish() function at the error handling code + * will internally call pm_runtime_put_autosuspend(). + */ ret =3D pm_runtime_get_sync(ctx->dev->dev); if (ret < 0) goto err_cancel_job; --=20 2.30.2