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=1619518436; cv=none; d=zohomail.com; s=zohoarc; b=Ezx92KUyu+qWlUvUR4y+HbwbmnQ6GvuSP1+IOOylajn2EVHV7csVIna2kN+Uyw8oOpA7oaMHLhb/Y/OUfAY0Wr+4hZkKLpua4/5DQy7Oo1x8ExPzYZbhA0HDMK9/Nz7TXcIUmUtSDo9rNBkB15z5fIj2b1InDyokPNBNV7yQah8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518436; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mOHN9sVOqwVyMbynIaZxo85h3Y2vXxONYl9KCxJ3nhA=; b=dm62mTw4T9+eqs7lr+AenoWJTrYr03kawwTyFMEPv38+UJR4cxBUq8tBsKWnbcuwPBs04/yaQhmhljbR2KCvfaharB3gS6YjG2SEmVu3KbO8XfCbjWg/F/In0M9eHS47ePZKftcpYJgKlXl7fY64oS7T9PjRUqRZLqOgMy3H85w= 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 1619518436662724.9434220909037; Tue, 27 Apr 2021 03:13:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235440AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:34442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235181AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D60B9611ED; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4d-8D; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518430; bh=rRI8k7N4z41xHzK06mi5M7fZFMz4ECEDrJIiREDOdF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pkiEDdcc+9ZVgINwq7qDhHRDU/jL4TCvY9fmQ5shUJiZGzD3rZxgYoCapv0MIs63/ +4JjmIbUcQ9bIMj5aIeXeB7z3xF3N6UpPaByjHXXSgha7rTDeBBVMUOLhJfPdbbFRS frp0UNVCsZYqiihSJDN0xa9pIAC5OGNKynVqkCV5Ce5W8YDlvyese7RJGuCGpaH0dd QC735y/92zi21OcsK2+qVErOT8D1jiKS14QUi0vxAHFs/3eDgAMnxQiqkDuzr/8sIE QvZ8WoPM+i96ESapBAzFVvSRkQf3G8ICWXo2IfmyfGo2yrUannRRK3Iy3bQhA4bVdr cqR4QZhZMd3Uw== 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 v2 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Date: Tue, 27 Apr 2021 12:12:28 +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 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..fe63b9ab5b20 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 ret; + } =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 ret; + } =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=1619518466; cv=none; d=zohomail.com; s=zohoarc; b=iSDiZdp4ASCxpQ/0SGoJlxWYOqHFvI9xBcCUgVBnkrg7DP9pTosG2eaHxJFyOzL/uxdy3AV8oNVstdDiTexeREWi/6qczME7krwgaBg2mPyE6qHhaG2dtIEm4OgBz9o0Z3wniFCagP9vSELsmqe+6PWgn306LUyNfC+coJ4ysBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518466; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3PC9guMqQNi7sxMrpV9+QTY1ux8dKSUuiabxwTzKtnI=; b=HsmrHIAX2YLyEbz6/a47kzLRGuE9/1ivr6XWHfUTBrk9PK/rosmi6SYS4RhA+YTQX2MiXJiq7RvV9ZJNEW4UdivoiiI6v5A9yydm3dJ0Q5mSI3gCVZR4Gc/CNjt49gHujZpJkZkvU2zn562hJVdPi74+ehs5ZV86xKl1qvKVfbo= 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 1619518466578576.8480984718681; Tue, 27 Apr 2021 03:14:26 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235733AbhD0KPI (ORCPT ); Tue, 27 Apr 2021 06:15:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:34658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235268AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EEC5E613CF; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4f-9q; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=Dz4yuaAkE3G30hsowoZG+/b+CgXUAS8PpNDZLkNm+lU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LBf4W9RKz5BBonSdEtXhxn5lmb/bEJ9yN6halpTLgkI/cMsCSJ8CJGFBoFe/6MlvK uE4rOQO+oQW0k5nRlKLEvRnzgonMoScpGmuIutaGqH20jMZ7DrStIswhsI1cASeR28 Jv/xYkLc8h6i8BexaOtpohbUDmyWxG/wPEEcIge/2r9+GgCi5GUgKIa6xcNYc/SlNF DQlXowrftBJUmHiuE1E0oHzAwC8Yn950smVVRaZ8nZlnC50VgEWon3RaRJuoTfBxy6 JG0BKJ/bNkObmaUnpmLrpcunepLNOlix4DB0d9DkBD5mbl3n2KefwNeJFNPQTJ++fQ 68AlL84UtPaTg== 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 v2 02/79] media: i2c: ccs-core: return the right error code at suspend Date: Tue, 27 Apr 2021 12:12:29 +0200 Message-Id: <745502b8a3216c0607dcb2a9c401636f245c32ad.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518443; cv=none; d=zohomail.com; s=zohoarc; b=N36XAj9NnoW3MOsj8WybJLf6+EDCAxFHqy7Ap+qcoeUWvdYw+f4yvqVdgeQtZlJtr+iXFrOfcfRZT3ijUZXjeGmmqpvyKCS86Aj01+bY5XVjaNXzh0vW3Ourum0jjrcRYy7YNNXuFQx98Z04TM2wg7r4i+ClZY9q0BUdO7OSKVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518443; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kjnLXQEdLAaAUIB7fhsYdzDvLyZbZgxSnwykg3MqESI=; b=MDxNTJHevONrQemgLx7VpidRY8DeOr7fhPlT5DG0iUG2/f10TzKk2nUejVnz2dYdTBLzJldmMfCvyrPfpQPKtD50tJRXegFsOqie/eWL4zaZsNAM93+Qkwx6pzn+VRf/b/Dd7A8AYt4o5yrYOO2HS9zZxAQfyNhEq54mgBfKcjM= 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 1619518443846114.10130352451881; Tue, 27 Apr 2021 03:14:03 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235528AbhD0KOo (ORCPT ); Tue, 27 Apr 2021 06:14:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:34504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235225AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D95A0613C3; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4j-Aw; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518430; bh=yher15YM7h61KHb/hY+EJ/RRJANP10wcnUo8G05kfG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T3XWa01AwHvFFDXxPmHCkXGTpu38NkeBQsMzh+aS2GAQnXF2qtZeFHRaKoIlsegp/ SoD9/IACexeeo1blB8Ydt5o2Pr5A+/JjnLgHUMiatdPxv5kvpVMW4vm71eIVQv5hCh Oi779nfJAbRT5NrWcSD6CNptFxLtS53RXam/B7/PFki0PRWY73hbkr8J9wh71R1GxF bdNiXKvSYNH+DdhdKr/wemLCbawzsQmTK0PwbnwnO8J/Sf2FVoP/gs18XWZgm3rpGV GR21XcsN/zuvrf3TjsPSg6zuDTCuDlHTo85570h1FRhV3GBVubaizLJkzO9WzTlsky sDyIsDwW1ZNyA== 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 v2 03/79] media: i2c: mt9m001: don't resume at remove time Date: Tue, 27 Apr 2021 12:12:30 +0200 Message-Id: <5a5442f20a8ddfd18d1231c1f33356729dc8c9c1.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518447; cv=none; d=zohomail.com; s=zohoarc; b=gqwconFkJkj8NMn7qKKBCBjN7BI7ep6qmC/W9447fWE4c0tVVTjaJ9Xh9FjhXClLAkFYclfV7iifisL7IALQ8VqzUPiA6qmle/NDIYtTD6seLW1cemyK+ziYa4z5jR2USxZgDLApAkiC0rwBM83jbghAowv7MINxLrwU2xROojk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518447; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=guK99YQ1VKcZYfgaegiSnFwGx8FYC3jl/5vfAailnoI=; b=MTV1n84xAWOa2mqOAAfmjEbHpU75vSQatdJW25Kk7A1wpeW0MgOkRvNdMl5dRh5dx8R07Xjyav5BSevcfdRh9n9V1lCU7Mv0IC3CNiS0+qv9Ea2myJc3aW6+yaTwGSFDLatMP3F7XEXvjM05snHO4HT+XQoIjc8fHq8BI4//y84= 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 161951844741653.37172211437894; Tue, 27 Apr 2021 03:14:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235593AbhD0KOs (ORCPT ); Tue, 27 Apr 2021 06:14:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:34514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235133AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D0FCF61185; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4m-Ce; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518430; bh=5AHhx16DJL5gdJqgumKoh72s5QcxkeHszhw8tqlTmq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NTA2S1Sonleg150UpGEVecKnFYj5RHSvkQVL4DvMeWJhOWgWc473mJZuzHMDM+8cb AOdW6pRJjU3f/SXMbU/eAdTCp3cL4Qbw+Ikdbe69CsKulaLFTh/KREbaWdCAofyzrw G9u9zDZNSZwrbax1s1S8HwDL1p89TAxuI3vEXQDmGACKYeFV3owAqx3l4LowUw9E7u 0cz3kVwhEi6r0FhH3WszSczzCYMHeJoDbNsUgj6FwV7BvLk5D3oM78ONjVT2mdU+U/ sxeNIrFFaweUH3XMZRM1o3fixW2EgDeTxns4KkX+7dkyBaXWayHIa9M3tsTNZlP7OH KNH6mdRPWjGWA== 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 v2 04/79] media: i2c: ov7740: don't resume at remove time Date: Tue, 27 Apr 2021 12:12:31 +0200 Message-Id: <7d310b4db4f7b24bd187d76ab21eabc36e4a7856.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518439; cv=none; d=zohomail.com; s=zohoarc; b=BSS/bXD9mg4fPF84rFMHLTZ1EkxZz+n2V8cfejbTYjKFbeJyn02Ter9zBvhXoy+6c1WmWj/19PA3I3Gmz6zMKq2CDwC2iu43jwbCBAfHwxoNxj0mNi2gbLZpNQauIyqNcJuBB6p2zJNvWBBVb/o/LqQtQdjuK15oVyaD2xHCR2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518439; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y4HbtEW1zV5dDZwbpaA+MDL4IcAxQ1flmWTbEwBwsyg=; b=HlxGKFmeKxEMlYlUZnK6TZxjLtwDjJ/oWWu5oaTKJYEWzggg+Ls3b/V7kQUydpfAY62KBGAQjPZBZFW9MM72lGYHj/raDD3haaegmMFn4h7E0KHI/uJnrgikgqGSzdNo/3mt98msrqp7ftsDUeQByVgME6QYL/e5ShaIWO2h7aU= 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 1619518439476608.4867742518019; Tue, 27 Apr 2021 03:13:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235485AbhD0KOk (ORCPT ); Tue, 27 Apr 2021 06:14:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:34416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CBC1D6101D; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4p-Dl; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518430; bh=v0N3nXsqMajMGBVdnEBF4DR9l7FpjhgT+LyWaPFGjVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/kz6QWyev0skRLpw2DZgDie2FWO3S8xNLHUdmf3C68v45zePcljDBMHgroqkJCpY A2DaPMJK3Rb+Nohy0CRDswgkjwHchK/lko6z7EVo5UZ/a0vAB6jLt5Lu9cUclHp4QT TmyTbDEmLbW12Cb6YaF1e6Q2d1uK/GVtRktNmpnsZil4o6yigXVKQ66vMxmw5OB2aS lZdfbF9QpFC6oHMZLGZYlzS8Y43DGF/Jz6NwXxKOV6YbA1i9nWQIr8o8LbUGtcmei2 Smzp/jVFZFNPtqu89QBpGB4JdoAZc0/RqTjXbbBUUY2TUjvtcv5kRODK6aFcpoyZ1L vOr9Y0vHTgqNg== 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 v2 05/79] media: i2c: video-i2c: don't resume at remove time Date: Tue, 27 Apr 2021 12:12:32 +0200 Message-Id: <25c574a9459b43940d71e3f18942b936aae64820.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518499; cv=none; d=zohomail.com; s=zohoarc; b=YiE9C2nsYfzOr+Qyoeq2/JZilmhm3/zwV0yo26b+9yborICjz6vkGDiFBhNFrITTW9O9CT1/MWwX0ZzDEX+mIT79XI4hjkl5hugLvEgYEQJL/y6W+ir78AxFV6oHaG0cR7tfZG9c/slCUqgHNHvOcte/HUEkJeI6MPETfCavW4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518499; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=79dWgd//jb1ogaDGIhMBJ4K4q3CzJDbVFoiHLI9HXdc=; b=MX9M9wEeY5y1yW53Q1jPuHZVJd7cYfIhCKduoRuIQQchgtDa47ZiJ/krJq6+sLQlxNupuzslvGbwut6FqS+l8QN1t5MqtWZILV3Lov3GqIbcpJUKvTRBv+Yf2fVjS9g4bvZ2xlP6csxvbtxd2lU6BqtUXgpIxTpuYp7dEN1La4s= 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 1619518499162627.7657489386407; Tue, 27 Apr 2021 03:14:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237565AbhD0KPi (ORCPT ); Tue, 27 Apr 2021 06:15:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235362AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E6A47613C8; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4s-Es; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=f7qp1inQpFhzLXGKfN6L+okBW8R7Adck1d72J+XCiZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LxNL0qj3rr1b2/nH8+UwBD8iLX4yyUe6p0kSfE5DZIeGha3gEC9iDUmCk6Jv/eP4/ dv2eQ/bK39W03llKAissmZssAou4xejK9aTKW/CBO+w8Tz46lh61VrsJlPy0m4pg83 ppBF7hmgdGAqv9p7BBkUql34pF3lBxeWxCz6wIkNfJFj9xPbmz6OWKGaDzgzpOhLiV KlC8BmTid9T5URTl1j9FG9g82aOlzv5NXKRxi2xCQOSRSzBeg3M3dbi63kwFfc6VdY F2omCVA2qbMyN7YtCqcZTW83u6fM31e7u2EKnGrbeQdj4QDjOC8yEnThgLPoHb80xa t/z07HtOn9U8Q== 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 v2 06/79] media: exynos-gsc: don't resume at remove time Date: Tue, 27 Apr 2021 12:12:33 +0200 Message-Id: <7f29a390daf93c38c4d52b9ccdfb113df5ebace7.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518454; cv=none; d=zohomail.com; s=zohoarc; b=Zp6uIIce6+KQku9E8uZPA3i8YH5+BLwIjeToARGw5C94Agq8HSvcaI8buxMifxyzWqKFdS34rhRlfeDOtrzEzqihNIblAVr0SR/i9+frQuzj8K+0WI56hSlYSplNNmrvsZAuRWAcao5/3SD3aPBUIat9OJcyvmzzfgVB8sIs3TI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518454; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jEITpg5PVFjzGLluAxPMynipaClS1/3Jo4C972zlT7Y=; b=bvS2v9WE0woWMk/pcKJZbwiPvtbsmX7+VEbX8uh7rrgSOsCogmX/NqudD1ga7WX03B3i+jkMmuF6yHkDwQ7g6YiSanP29NmNqWXGJdNvmKUiwP0fw/QvCxdHE/9rZuagKzTi/NWaZyLkXkIDKldAr7+/S2tpbvYWlbgx98atnzo= 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 1619518454630375.39508848016305; Tue, 27 Apr 2021 03:14:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235476AbhD0KOz (ORCPT ); Tue, 27 Apr 2021 06:14:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235304AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE919613C6; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4v-G1; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=7cvQL/2CEUShgMHfIXo5pZaMj/4OUeemdQZifBElsOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hq3COPd8OSGdrif9VHBXp6CRwrjlAlnTvk5/oCgS/5HkYgaF4txepgkMiS6npJqVG OzNYWc98VW1sp/SWYNQZYOq9Ip22eUE5+WTbe4UK8LQOuzkZTwqhod4l/4q9mWNtvf SzWMjNybANnSNDFxd6dGpUCyhWrnXduNZqs+PVDhX3NA/UFMItXV3G9MYGByljG4Gq TqOFedyOVqJ925bj5002+wOBOZvJbJP7jvB2VDu6BbjGrAMAsIykdltiVuwzSXqsOC SbcLMYf3Vcqg4p7v8cUw34i70CiAd2OQVhngcOxhwUbq5Ul0btt4cWoAdRYODFNsdo VeItlx8fMzgxA== 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 v2 07/79] media: atmel: properly get pm_runtime Date: Tue, 27 Apr 2021 12:12:34 +0200 Message-Id: <246fe06a2621c5945f474fdf357aa5e5a4e1fb12.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518474; cv=none; d=zohomail.com; s=zohoarc; b=WaWASiyAtTiBD+59UFOojMfzbsd/S3/kVR1reOoYddEN1DXJeQEmKILwVbJvOtRoNv88AxxD7646NldlRkc8pRppMUqCLvDyMrqHtpuPNpLwPYpMZ8IOEltKrmTz588nPTggRs5+zzPWOsIHTeFyKf7pri9V/8i25S7i0Izi0Xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518474; 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=Z+Rt3DZ7Zd3S2CRDG5nPBwg83riM1QCoKsSyzg89WOoukH8HtMSDOr3fuK91aVu9X5+h1sKltqYN7t1nM/+GVr94Co5E4xfSMyftpMDOHK0RSsn9MsVQAcY8a5ph2H0B4HHXHrJivYCdYgpJzG0ROMjESKux8pr9jMWTJC6X3ho= 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 1619518474081904.8021568357733; Tue, 27 Apr 2021 03:14:34 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235588AbhD0KPP (ORCPT ); Tue, 27 Apr 2021 06:15:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:34660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235364AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE9A0613CB; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4y-HS; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=HuTLNsPcfIqbw1UtY6p4jIBErIihq3Y8I/97JFK7QN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mf7eW9dP2TP0sjdkkPONBu0GYBayxwv2UnUXwRAYpWxdDjQ8GIpxeinjnavuWBVQ/ auG+nF0SZiLP04Id86GgOX7nUZZrxrxyf2NC5hMPMq6XLhD2zri/RnqdFA5EjhjpmA qrPNgfsFSAD5okzqBGxa1qTECjE2dIPIE6waXWG4FhP2PSi1eU7rRHFUtrL2scSzwJ L0BLpNQ5dUk52EqAuyQDsbXBBefVZKQkMXdiWqrmluIsBqAfsfpydZu/m6I7KmyXue PYHjcdkKtptN8FN5PlIFaM63U2OkzP4jcekDeiptJar68dcUlC9EWi3RZRQYogo0lE pDqGqHWYm2vPw== 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 v2 08/79] media: marvel-ccic: fix some issues when getting pm_runtime Date: Tue, 27 Apr 2021 12:12:35 +0200 Message-Id: <94d58e3b2323193deaa0f644da8fd0780f513827.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518494; cv=none; d=zohomail.com; s=zohoarc; b=nPr49wtYwpuUBdCeBea3BJi+B/N6Ozq/LrQcvJyVih97P1nJox6xLfN0Ezwv6WsLWQj6g10gQHMijazCHpZo1KeptUfBxRMNcQe50EcTKbozAoGlJiBJjytuyVdofQ2dfGq+1WW4v542s/5guENimwzFUKUMwzvuJzHoSOF2YQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518494; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CkzDiRgPy8iejVwPrfGJj8JwW/3IpRiOAho8UUQxXuo=; b=n9vSA0IQj/OwUbH5HL0Bv5yYWRyNA80Q+ibHliZOm0bOwHTyHoPNts7oxHPnmWrGgDa093DLxa8tbBqWiERZuj1vXYnelXQeS1eZG4NFOwqvtFj/1KKxYtmdqPCMmSmqc4Ns1upv0+xikd31ZxkbOLOfIFSMNFYP0dSjfI7jO9U= 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 1619518494393617.8665824322758; Tue, 27 Apr 2021 03:14:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237469AbhD0KPf (ORCPT ); Tue, 27 Apr 2021 06:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:34866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235366AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E6F2B613C9; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j51-J8; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=XfZSeMotNFyXbfT608pw1ECU5JJkssXPopFyWbltzaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nr2lUUMOHAMasRjwlY5qX3qVA4oegZ5AgUvpL6usdP7kYYZZZM6TsC32yW50v4n6u tcvNRQPCPk6KdTQhVAuWpm8L6wfnAnIjOKNjBAs6jwHBPaBboSwVTtHXpbVHICzTcc 1lBOKpP8EbMRNwPR8QTTYS2F24GO8hT3AURqYHmbXcQqcXviY2sO/li0wDxoeiLi33 nc5lIPv6zUXjHIDqnptAPfdDLqX7OdAffVBQPSFke/Wxl7TBV7w+dNNYe8y48V1rZU mz502CLIOs0MXwwcj+kyRx0Ho46obWLtWanADRaK/TUGgaFs6xRbkw6cpbsKRwfj97 jsoJG5CIc2oSA== 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 v2 09/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:36 +0200 Message-Id: <36568b7ce611dfaf4abc3233c76018a137f934c8.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518461; cv=none; d=zohomail.com; s=zohoarc; b=I+GtE26OIZ9e2vWJnfXbJeXBwRQsQb01JgvJEklLPdv2yY7jIW+1j5X26yhJj966sPq+9sS4VD0OdMomk3vy81gvB51xiq/lyZyRwdIUy28FA52luceJrRAQyBQU4dFMs+HnUG/t/X8VVfOltYWpILl6qL9nFL38CXKHlBF0ibE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518461; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KgD/UET03mpXhrsM3R2k8AhQEpKAFT3bwKYvDYrD0nc=; b=WZrGkXDhNYC9KYzDPFoRVJl43zx5P5w8CP45Lqp2ssBD/UQ5qD7SHPEsYGH1e24N0kVFm7CXHymV59MvbEo00FiTUoFPH6RltDbfjqge5GZCQYnds4C/S7abRE/eMP/uwTq64ev6yIJyz8QBBq4AUkYuejn3gi6lMmvOd0yE/Ro= 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 1619518461867909.3694896723827; Tue, 27 Apr 2021 03:14:21 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235699AbhD0KPD (ORCPT ); Tue, 27 Apr 2021 06:15:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:34518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235246AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DC08F613C5; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j54-K8; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518430; bh=vSVgVx9oCI4BykR40BTa4+7tin+dlK2U4+Benc8+UkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DHeOYgg17IAhtKf2kG3l5ENtWblBsn9K//nDeh3BI5v8/jaPW/tPDqgJPSy/cOetP 2ITKnyUMUnRbs0QofKRleV3Nm2SCKuVDgi8OJloO7UgTyOiCpHycLx2GqtFa2WA61q uVlgSsAxagmWMh9CL8UF33VbGYDzyLoCTGzxGr/BNxoHmoAkscZEu8TQhpOgABJwAn om3V9/pdHBgO67UyuHQMGuRz7xebZt1z4eK8LDoh/U/VRhpFDRkhJTCdzcdDQ4ilID FYHnhXzeR6DqiRz4R9Z0jH07yVCT/aPh9L3PG8IQ1Y07FuJ/YJ3psHKyQszyoymlGL 2C2wg2iZ+0lMQ== 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 v2 10/79] media: rcar_fdp1: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:37 +0200 Message-Id: <449ab92cf6920f1d66cb831e15d92aed7f5b7192.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518561; cv=none; d=zohomail.com; s=zohoarc; b=KLYuVF2ApGukveeV5HoMDT4JyqsoOe2QfcvBhxEIGFVv7+q4PriySIu0Iy1ZJURKMIAws8nGSvEBoDIwpFmvlmdWtuTdOkiXlvnkX71lqc4MGt/6fPA0eK/aFLpWp3JWqwImjdn91crLKSvC+aISt+mfU8A3VAu4dMSnWoAY8gc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518561; 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=XDnZiQXd865/In7SzuVBSZO66P6E/B5HPvva0lfGB35dlfyf/opXkuC3bFGdzA/gT9PVdJ5mAbOD+Xd3ShQQfqGdogqmvAD0YIADvzqx9O3hFArL8Bg6OBQWc0GGuRQBVSrnpziI6NpLsFaB9JtiwwoS1/xltTZMSxc/FI7hVcs= 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 1619518561872943.5238265025754; Tue, 27 Apr 2021 03:16:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237197AbhD0KQn (ORCPT ); Tue, 27 Apr 2021 06:16:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:35166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235412AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 88BAA61002; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j57-LA; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=uJQR0czm+DeAW2PWQeBvZ4Rvzd+S5i8+90myFebensI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NiQvYMF7OEWPJzkJcicJ7WcKvB0H3GERIgYfA5qd0WtSjnaR0/nAV3hMCadwmEBnt 4Q0sn828e2ClzSrXWAtUuIDkwINCzefQc5ICV1bguILEAdRR66cv/1jXdl9aEvRcRD Bhx8pj/CKQr/EPlPqWchTGcwCLeQnx+qsO71Obg5pOpy0+39ert3POkP7ii32N1zeU XveXVnKAn9x/663ekqaHhQLsC16Ik7jDuulgkWxnbnMOCpwuwSCaBDoZ6iUKIiOLGH xkHRvRXlm6NGdmEAOPXnHv5P+44UCyanuBFz0MRONQIWQyeh8mwCBCsqWRTqxDSKDW SKrNb8oYv9xlQ== 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 v2 11/79] media: rga-buf: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12: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. 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=1619518570; cv=none; d=zohomail.com; s=zohoarc; b=O5XyYj43Q5zEci0nN+RySrkruLgHlcF7Dq03XdSM/z/sRsn6kRsPtCUpdSqvLiQFYf++Uu53dnk1nnuXb+cHOGmYOqH0oFWYH9Q+tQ4T5rmcXVJQwuChd+UWs2oiq3ukB8Pg3SjSCOafDg88NAhpdUXDPyLzHxkeLXNpejTB+yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518570; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tWU6oxk3O0XbPxS5UZj38gwI17sYWRfTMEjtpdj4j80=; b=OgQoXtpLiVFJYDecPLc8padV/qXOHGRQ/oXkE5L5Mc/rvBCFa9VvXwZjQHfO3tvGYcazZAk3/64/LugxPUHiRjh4M5Q4BM2WLUKDWml2liG57mrix2UPc2TxIJHeenpJxqyb/RGqk983kyht8epEwgz9YJ91l0jvz83tDXx7vnw= 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 1619518570322107.05654487690992; Tue, 27 Apr 2021 03:16:10 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237388AbhD0KQw (ORCPT ); Tue, 27 Apr 2021 06:16:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:35230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235415AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 918DE6141E; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5A-MC; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=WqKoYQevkaStNcKaOzNIvfyWSTMDPdaJk89Ynu0GOzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LoUuZ1TaQvQ5CxmEUPAH4lqIsqWPje2SWXVaMT/ZtNuDfR3nTI8ZWAsmwr41p2IMM 3z5seHicv+2UAiVd2MiUEchixXZRWwMB+hqJI78+10zMnyEU29EAhOhtUinvb8MGoq ixDj4arF48KriUB2ZlDwz59DGcaI77Eb661OQ3kRbGm0dh27eMsHsnxTR5djV4sSx1 aa6pT5jaxD+42cb2avrORk2voD1zCEF+Gzm9xQh/g/wH5DZhiDbL4Axet3h3E08OuX L/ZcTQiacEtoeseaM0YCvjBIStKyG5ImGvs+LialnnAcTyRvuiLvRUskwOkyICBiv0 O3Uc5it5DhGIg== 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 v2 12/79] media: renesas-ceu: Properly check for PM errors Date: Tue, 27 Apr 2021 12:12:39 +0200 Message-Id: <442ba0816c3977dddf01212659443ee13f90bd5d.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518509; cv=none; d=zohomail.com; s=zohoarc; b=E/pAlQlpahgSBIa1sRAHJvvnmEM5msRkIJBG9Y7TMllRVyoGBqmCdqYW51776Gct/NefG9RTPReJ21+IvBysWyhWZbNGIrJ8xuK1PXUoKXXXLCzaupHFGNd/avUrwzZpu8WXBVEB/GgoRVjzJEctLT+evy4FjHhH0J1AaR5XaFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518509; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JZCcDtEMjFU3G6MX5kOHe8ojHFY31zzJmAJGlChNtgg=; b=AIFAYobxZW/jqWETZDt0K1QcjhWsfR4Cl54b6F11iSE0Vym5VFxrGnSoGDt8hRzxPx/iuCWmaZFHuWIVWtcAdAMMgWJRw5fixVLZMwZIjU7QzXAp0VQQKFwPPqQesm4DWDnhXkDbF/M8rMZRZzROUDdS33Sdp4KnhMM+s4psl2k= 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 1619518509503766.5561270065441; Tue, 27 Apr 2021 03:15:09 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237670AbhD0KPu (ORCPT ); Tue, 27 Apr 2021 06:15:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235369AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0AC42613D7; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5D-NB; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=ozAIBQhBgl4hYvo20eM4TXq01azS0FPBmDKGIed3VZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuwsfLYcUi38xmu83GyBHZLxUohbg1NqqupeRKfqB3+/nM99vKRGZZezvrhVoh8iI e4CcnC4riQ1gOlnXfX+xChGqaPaNwQfEef+9eDfMnvHnctwkFhTXh5JM6PIHY/ld4F WHayV2J9qR4bhDdtkw55iYIdOrdIfg+xH7/nUGVIZxfz0duBTGvXDjCp2l06oH7F/n ctA5RGU3WEANvjfiqvO+czngubNbQVPMn0iMG7FIjvVxyqb28XgXnJLIQJzWRVZXeM 7kLdNabtcr51VayI4eqV8Qsqo6AC/f/CUrxYKjsZ9HUIZDS0uqrVUI2dhh5UsvSqu2 zmJijurrDoDFA== 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 v2 13/79] media: s5p: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12: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" 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=1619518679; cv=none; d=zohomail.com; s=zohoarc; b=Mo5XbbtKbqt06zf7vLi0AcfTY5IxmHfA4ZihslEO0NtYQZLsnhj+QgQ2LQZb1/PX4FRroVhk40Bnm0kq4HPf5zVsvWTRhjiq1tfc78SliyzvQ3vzOuEZUmHbxP4GmH+eOJ1MSIjhX+BxuAgboFvdQZ9MpS8KZtNaF7+K6Lx7MO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518679; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L9GUzAChTMJUtDH0+OWuOob2OsTvBtiUXD5nsFmfEUo=; b=G9l9JOSyyAS4BSu3utrTs2WPELXkjrykV4AjAQYczgTgPIHorbPUfJIYGJ+xvB0OIkmlPWeX8sBpA5VlAgAJ8CeKFnbMcciOlMKoe4UThxoF7HC6TPUbLGZsVQMDMWzE4KZducTlw6W8TVr3uNNQruu7Axf86RSbgAuP/2J0Rqw= 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 1619518679077233.74414724179826; Tue, 27 Apr 2021 03:17:59 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238146AbhD0KSl (ORCPT ); Tue, 27 Apr 2021 06:18:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235592AbhD0KOs (ORCPT ); Tue, 27 Apr 2021 06:14:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 38FC561923; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5G-OH; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=v3oOn6uPHJX4lDQc2LG+Rn/44BbALYGNkVgzHn1PdbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QYf5fRS1/rmz22chlWb+8rQj+/GJB9Pbz8xRaWgozmM98EQdsWSk/e47nrliLEVH1 GP0SmZ7t/GmzxEVU/i1oTmsCNTylnviKazpS63GKE+a6D6C/PBG8xYz3KPqEwO9Zt9 yrnxQOJZdZfglalRIIs6EIWFLtGQLtpHTCi1yfNn9dv508Xcbu6LHo9YYYZLg9rRrR 7+LCkoBCqj8litNqIwBaxKkVWsiVZKef9KT/M/HJW0Wkqng9NaW8b++Cu/EM8wfr9Q 2ZIxyRig0h4Ce3x0qPMUatkV8NuIvx6H/f+XPgdw19+fbMk46R8UmmaYSv3x/cyj8Z g22ZunrliBA6Q== 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 v2 14/79] media: am437x: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:41 +0200 Message-Id: <98c638ac1c2c85c08afc14d63cface1cdbc508bf.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518457; cv=none; d=zohomail.com; s=zohoarc; b=T2U8aK/pxIjcSzDlHTDtVFV221Ex6jGYHisOBrLZo2YnOH9snWJwZO2rox7w5c9m+4+ZKx/xAbAy/E+FHC8y7mz4AqvaHyiv3Cxyrj6fs1ZnzFYbqV8j06BsZQBl26/EPPGWwOUDRXBfZK78gix8ykbmhf+Alko1Z9PPijqSctM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518457; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ekBNSaGAbkPoM4l+VTwHrOtr6ridwSwjQfLGetcTkbM=; b=UYmntmEtArzvddXSI6m1czvey3a0i4LOwBTjsWRf0NooDbAMI8w0nsu8xx629s5UgT3lyRBwZ5y01BDPPg5hfrsvhUbzA8+mM9V5M94zLBdHn0sv1YHYormtTtk5nkzV1hOnfl7FsGOJ1kmQzEvukoXq12T0qL7m8qX8Dim1oZI= 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 1619518457892507.4894090153831; Tue, 27 Apr 2021 03:14:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235666AbhD0KO6 (ORCPT ); Tue, 27 Apr 2021 06:14:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:34660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235192AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0700E613D2; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5J-PP; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=euIQLwDaPDSgWFx6NM45FK2bpju26XjkPQY0ICj4Fck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDXaQwEUJm7SRklIGk3U2iLCY1FADzAXdT/tx110ICyofdHBH4XkcBq+fBiQze2vI MycMemIuwA8YahMx0PhnrbvcPQov7mxiMN69y46uQSjtsB6EeVVWbeZGlNhmDB+4za SVG1dtKWpFFzqPPMl66OQRx6KG2iRnVnpwyiAiq5ZAh5C23PQNpoHvFd6ILklfZpgC 6vxeBaMooh6tZpcENlZHZ2rtovWSFgX/eXx1O6wKsKOhU3hA1sGzIutd1A8z7s/NxZ CAI3pw8RX3QcC34v/NWzwAqC4SvU8XOxKZg3EmXkoi/f5NU37nwrGhmAyS/M0XiIjY haeddbi8qltGA== 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 v2 15/79] media: sh_vou: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:42 +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 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=1619518470; cv=none; d=zohomail.com; s=zohoarc; b=Im2mwNetnxBlzbFyKUXzBpOUSIX1FmE5ueBnBjvWwehDit4ytXgsYEYKzpw09BUS9/U/SAGc4Vopi7h9dYB2ERyBZoYduVfRxQgCxiYFdaoZZ+ASNLEMaCYQAO9E9H4jNfnNjoOMgP3R6ambSlS8W2DadRKkyJsWwUagWWvSdVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518470; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uvxTCk9qFVRZeWu4OWV5nbuso6Js4+D7jvAIh37TJlk=; b=KlBiC8OFjhJA4n31Rv+Uh2hGA2wQyW+lGXv9Cr74nEmDix0kdErXa+BLjVZZT853JAg7FugOazS+NuD5XhVDy0Env3jFmCdQUQcoYl+WKAnidF70k2gMcU0EFhDqJKWTtlZGhuLvmoDlSvhWPHYhCUxVtzl3U+2ROFm8vapBrd4= 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 1619518470345417.0372867278704; Tue, 27 Apr 2021 03:14:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235849AbhD0KPM (ORCPT ); Tue, 27 Apr 2021 06:15:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235353AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06263613D1; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5M-QV; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=dO1gD2vCTyNaQMmr4CD5RrufRsq5HOpPc9z13n0Rohk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kreVFPQyyC+gt6dxASA1KwIHM7ks8tRyxNcLuXn/lmMuigpR+ad9uCR0tmJJFUZOC MPZLTG9gNZ2+lQzLNVApsxsJS+GTaIRD8vhzg8lXUqwGmjoQ8ZlOEqXoag/sjjtxWv uO6jW1O6Sa57Xnj2KY8FgESId3A3y+jwy4eXq6/9wJvZbgM4+oxcre+ReRdGj3nqT4 0+CXXauGBWEmSZ/coF+VvxP7CJ3X23rxuQsVj6eisjF2AuBcf5L3Tc/79RcXEbzoBm Kjp+Gm+nH3MSvIKCO98uEPJ1b/BSDX/cGVMzBC3CbcY+MX/F79B8L6xKXbcbrTUl3W YLmslc9I4mHnQ== 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 v2 16/79] media: mtk-vcodec: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12: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" 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=1619518481; cv=none; d=zohomail.com; s=zohoarc; b=JJU7U1VQgGr6g693ZYJPGSkmQ7cxZIcdMBTyBrcKjHRpQfInjL9di/YTRoh2c9GjZhqHIEHdaZbzith0HoaAo+YMvb0hGpZ4dYxxKRvNC+ZNm2N4wMIZVW/FoV0kRBZfnf1QERogIDH8mzxgJmq0G9Fii6/3i0SGr7JgocvXgf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518481; 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=Em3/qjVxR89cEHK6iZ0wNyEi1pMZnMDWPrR3W1NjB3xKLALm1gU33RYt2g+sRJxZLdIeQqBTlQ7S2aE7KsXVgYBuQk9zV3hyK/4rkGrXvFxUPpPNydu9FlFYy3zxG3xPD6ryKqz0P1yCJlhn2ekR4yau1/b18Jdz8yRMN1BsltE= 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 1619518481801944.5964154266052; Tue, 27 Apr 2021 03:14:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236782AbhD0KPU (ORCPT ); Tue, 27 Apr 2021 06:15:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:34772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235351AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0708F613D3; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5P-RZ; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=cJmIogEt8DtaRrLuirE0smJSOENxo/aAnd7cgWYfYDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZp74C/N3xULsOG1NcjGyCnHrQUbBn7L4C6SjULa6jlIkjkwb4uQjAmyz7MBIatyJ 8aZXyLOROj+YrO2pBurSY+F68uEs1Jq7JH8uqCwePJcN1IGEgiLVpmyxerCcjGmQIf ZTmIUdmWmE3sxwJyOEeTKlY2LM2tJP+uzh4xlcCEuQ3IuqdQWKS9j1AdkFOrYN6Vor RafH87t0RcMEZ2XSQQBWv5wtqRM3l8dW6T/m2a2MOTN6eezeZbhPil2BAoyM/Z8ZFK 9q5GHr2H+784p6XQXO43aCpof7AgRGZF/J7/LD2TXJKgfIX/Wx5n9U0dNdaQ39pRd9 JuMWqXSUso+VQ== 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 v2 17/79] media: s5p-jpeg: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:44 +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: 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=1619518469; cv=none; d=zohomail.com; s=zohoarc; b=Q8gzzMYIRhqCP60n3RNqOTa1jsPfCHML1NV9L+86OIfg6eGRkj5bhdWFRbXHWS4wPqKh9QDuzzVnLgSS1NoX3GlulfMsYCRXcb5IgHqwX24HlM0P4u/icTGbTzXTzHUi4tB1U9X467GdRV9MdI+81eZKKVT42/pIZkguuci7U5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518469; 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=RfbZn05Rzee8lWcYXyRvc5zla3/vnDkIUGXG50/OzhztcNIU93v40HoSIC3d+jfXHNuear/+Dt7oILfJHwJXtpVUFt03CAiWNXPeltRiyercNKWimBlttR37XCUZTf2x2pbTZREbr19OVzDhGSKXpsf4402iE9jVND+qSGCmIAE= 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 1619518469295515.9865540205897; Tue, 27 Apr 2021 03:14:29 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235754AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:34668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235314AbhD0KOe (ORCPT ); Tue, 27 Apr 2021 06:14:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0CB60613D8; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5S-Sd; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=U3xPtY+HT1GPqKz+iC8qw5pPuPioh4afaqfdd0R7SD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SF3VGC81jsafrWSb4/+wRsXESNkqb6f087GFtYbL/2+Ajlc4mf6YsA6kWU+zFFinI clmLzaWVwHQyOA9g2Fn2fNMdi1lddtkNBbDYHOuxwh1ge+ToyaS2OuwzS9W0x3E1Kf yX7rHEMbwV1E0ZkvJmx26OP/OV3ssZIv/G2nBAGzyZQ78Pi5/mjJ2xfyybou4IWWnW +ujwaT3KdQSYngxdcbauaCmrC3zSJOcf9AATfe4pYp6v0/T3KBGKFEsBNliHwsBptD rvluOfKwrkg3UJr6ZYNEE0kBT1ZgVkJYgavWSXQUTP6tRYOfkvXEHQMPjcyBa952E6 hAd9Qgpx/b17Q== 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 v2 18/79] media: delta-v4l2: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:45 +0200 Message-Id: <9d65648bf69e2c7b2c59fdf06214153491d4cdf2.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518520; cv=none; d=zohomail.com; s=zohoarc; b=Wtt2RWNuCtEv505j3W1xx1q6UZyecmb0RxLpXwuGof6jSlSmlI3QyoaFaR7y8C7yeDoNmHxj6LWX5Or7cpwxse0j3QZkPYb53yG49vu++BUEbo3u0Kd5pgv+nwkYTdMv0Jo40Y+S4mknMqgUkg76LXeLsO0siAwMSbWdVuFt3c4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518520; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UfqjQEksWt8M3LbdegcX5y2dPdTX6smEgNNd5wbgyV4=; b=a3EmzysmKV0OjVdixPm5IuI3jWGWvUgSwIDZVRmrFXZSKyjR9ziE8SC1lLyrnwfdj8el3m99Trq7gHoqGC1Pfsc4bEykRFJRUUzrVC29xBQ2S9ZwAUywJUUFozJZCjZaUpGLv87+/rZ6ZDQlNHfgUeJn2TNzVQW5C7ISqLqdGPY= 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 1619518520848151.54258325460796; Tue, 27 Apr 2021 03:15:20 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235743AbhD0KP4 (ORCPT ); Tue, 27 Apr 2021 06:15:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:34882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235372AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2C7F0613DD; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5V-Th; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=W1MZ5fUp2z9NMPUzLbsMjuPOyaCJXem6s4s1Qkfcwz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hl/iigHU0Oesf/zRgLXJO++yUuqv4vZAop3JusfzFYwsnudK1Vk+a+6STjFmKVJ5K a90uNH8biqOVfPM0kvWAOBbHAmIn0mMUy8D21LXMu+GjGo0NvEbJdAALGMhihek27N fKQsNlLivJ9Dcg3sPs/svUGoUTeSF1v1wTrrWiCh6gYzSp9x9yl+RyqZXmw24tJ3mp +w6itUbrY+OKDLexMH8dmcU1OwZkSlrLiwaNrtA3SS+kNrwmKfUHx2TCJQFMThaBQK SJHqjlKP/V7frEdSh8gPHjlTrr1dGBKARpKtq4RqDwet5P2vfGoy6GTPOVA9QM7fyr MLKKSSwnemUgQ== 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 v2 19/79] media: sun8i_rotate: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:46 +0200 Message-Id: <4e9d12ab641622cf2cd1721c257c12c52271cf05.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518490; cv=none; d=zohomail.com; s=zohoarc; b=W0e1J9/3rFYBUEHsBqmoWrRGevKH9iVygQhMzJs0M3G5eWz4nnMklX1iFb58crrurranxRVguJT0wU6H0iE3GhD+5AG5x8LVOXgygWCAoj3pst23Vg4QPR+JFgYFYRcY1IoAias9MTFJTCZJgdNLDo3cxfZZU7L6FhPTXIuc8Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518490; 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=E80DLhj47v06C8f+wINtMagCczCNWV6cxgVsn6NpQnth4EQjlGy/W7hTA6udGKVda8y1lSYCvCmFPF90Ar+B5jvNYll/QYFpHbraz4Pff2kKwSTYeF3DSDG2aYNviR3MdruhfJuXyB/D/rEJKw5uC6P0et/3ZNl8XGmAWAAovys= 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 1619518490211586.0735223435241; Tue, 27 Apr 2021 03:14:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237364AbhD0KPa (ORCPT ); Tue, 27 Apr 2021 06:15:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:34864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235370AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2DE0E613DE; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j5Y-Uq; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=LvHrsFJn6JLbIexuKZaI+hIEIjqhrM13uG8Z/t+ytHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVqLR7mFtMTLO0mK1TyVv9e+yTmOBkTKp+10OaJB+E8GKGvWzwvNELM5c29euVRTA USlnGTJVTJc1qUs5eiLRzGraPsUzUVxRBRdZb3dj2QYodiUjT21ZyJ3XdxD0sYvdb5 R8n08vJvzfzrjwR87IG9TYbo7F4hAXUTNwwiFTlSYLHGpPGL5JMt9a5XVt+otKb7Fk Qh8UHDBRVwMqDuoD7fHrAIuahwrZK7Ok4dbmXenwn7JQ3KIOyRWLDB3g8TBY9UOjrV XfCHLr0ZmqO/JJOaR4g8tbEZIoDPZc/cz4Ha+yXKWAuRKkaY4AHE5VXNYUixFP0vK3 +74rLo8FW28lQ== 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 v2 20/79] staging: media: rkvdec: fix pm_runtime_get_sync() usage count Date: Tue, 27 Apr 2021 12:12:47 +0200 Message-Id: <8990782e13de0f4b91fa6675bc5fdaeda2fd038a.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=1619518528; cv=none; d=zohomail.com; s=zohoarc; b=kDe9JrNwQ/8E9P3b4rnbdClCjk+IXgIWSNszRamoG1IgR3nm9LqsR5z2swQM+5bCyJIlBiq3GrfBdrVwVt8ElwR73FPVEnuu9qA4+S4UYrf3SFb0deMZOlH8Q1Q+686apLQxpyAp5ZlfSYhI3YA2WxCPjNnZnHJP4ldWTpu7/Og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518528; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y6HlWb0wG5TGvMKtCgYuawiYodsGrht96o2AYGryVBQ=; b=KajMGmXvsW25aVPFFZFTN4cVQAk2ndqHpVfcVRWrQlLQHj0syF1KpQh7p54PW4y+ayBKwtjC2pP7UMgA/3o+b0iURn0LjYrCvhsBX5oguqHb+0eGu3RCshROIpYg4vNsMs1Nbbt6NmpVU0ug11uUP1yGIHdMUlcf+q/Le0YmNtY= 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 1619518528514793.5624570751676; Tue, 27 Apr 2021 03:15:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237778AbhD0KQH (ORCPT ); Tue, 27 Apr 2021 06:16:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235380AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 45F64613F3; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5b-0M; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=ZOYDC8nizVOemN97ng0w67F2uxMXkIsqLhOdGgCw1ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ltbs4haX77wUTaNgOEPnkCkZ5mFTCSyn0QYu8/7qqZBV13a09lu4T5A0rYj/ZEpEP uzX25/iWkZqaoIM3h6qfKibVdPRayUV6uk5aeUCYsa65+azmLIb/8nxuGqFF3rzlKL eTMBve+MVtSJ+HMcNJgxZA+LAgeV0Zya1jy9xtyxvmbBl7QVUP8zsgG4cgo+PbJ0Mh CSZIR0SdezMrSGvkzVTicfJGFnYJklNBN2DBgnYFk+I02MSYtoLfUqDboUaQ/7iR5t RigO9HTjK+mSMEKIt/M1CCMj6czpg92eFlYHoIsip98CwhCrwcctX+KoUPRKeJJmNe 5xnxUBEEGSTRg== 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 v2 21/79] staging: media: atomisp_fops: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:48 +0200 Message-Id: <6db5624e2d137349965451f66bc47bbde357c60c.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518549; cv=none; d=zohomail.com; s=zohoarc; b=d8E8AF3iWRGqMw+YrKRfpHRbFsBGGJL1c05RwT4gj2hy2SqTK+a3yf39CDHC+3+pCBJNdTZkFxkNKUYYJzVh8dKQqlycKxPxUnTGlF+jiuNBS6rQz6CaiGEo3rq+U80gqkMldSTR237w0GkuWmU1wg4DWTmDTCDFn+c027Uaemw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518549; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mRlhHz+TXhBYOhgqqW4JThrnHdpvqrv4T1yGT3S16Vc=; b=I2eJxlGuahItbGEcx/ndAxIs9hpiM7Y3WY3vUpd3XAz8mcNZ86eJckUNde4A9m6amd+ki2M52G8GyZRj79IE/ClVv50j+OPACz1y8LfzmFCBC8lLlvwzRBAX83y8tKXaHLT/YqqGTyYFZYxx5IvAvql5oB6UqJYiVj/EjgLk6no= 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 161951854959242.04917046187086; Tue, 27 Apr 2021 03:15:49 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235974AbhD0KQb (ORCPT ); Tue, 27 Apr 2021 06:16:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:35156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235410AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6276C61404; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5e-1q; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=WwdunTEPlspSuJNcgiz5VlTq6QqTmYyotSIBFOxVREY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RtG8MWksBzzoyJ8f1T9mM9i2iWpOVxFMvdgZaznoqwOeoaF1BGLfN6hdQkAjTBmXG gb2wIhkMmOHaazVy75eeYno7XXgjTuDTo4qPz5ka6axbr96x+nj53BWjICe1um51TZ Ab2SEYW4bxlYb/EMBtKfknyNbdcyMBUMtn5cwqNvF53cmJ5coNHnmf55kcZuBwLfMK mdDcHBUCnS+i68sJTKVTgsL5OowpThLKgObLrRLqqp+Cgl4+UL2N7VTRjneXXG7SGn lbHNJ4HV7xV5mgvyn2gVH0+z2vWQ74G6QvtkK+B9ULi1pNuLp56InWHUaMNVebMj97 HV5QK/JmPrKRw== 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 v2 22/79] staging: media: imx7-mipi-csis: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:49 +0200 Message-Id: <9b52f8d9709e32ac129563f508beaec8ab321409.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Acked-by: 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=1619518545; cv=none; d=zohomail.com; s=zohoarc; b=NAz6VlBmyiv7z04ZbO+to7gXquGAFjQat6wrPQ9gY5pHtqOiXbsw0IrUjUEweP10gC2EJ37tBHLOS7h7V334I2v75AUgCd7Aqf8Tw/Xjm2tjdC2jLUccoM7z3y0gi+EwGofckdWj2LiyFw+k1/H7qtYeuC4PQycIhD22J2KPusQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518545; 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=QVcTBTbK66NPe2rVRUN/aU1pyyDAleZnaRuoP5vTvpZodW8bSFp7u74D3OJY/yJopdihXz6F8veLGAhL2PCQGa51qugO4UjYeJDTaERIO31MaSzpJW0UNqKwnRdnn30FNpc5bhtcgdOID3J/5YELBcQMNlqETXpKLikvjZ1l20g= 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 1619518545348156.8405002863709; Tue, 27 Apr 2021 03:15:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235508AbhD0KQX (ORCPT ); Tue, 27 Apr 2021 06:16:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:34658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235388AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5558D613F8; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5h-3f; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=9FSuKWFuUqPUC2dP9taAm5sC7kLWnC4fEOP9jl+QpYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R47c1M22tqSI8Jnfr6aBep3cHvKDHKV42ga5GGGwTWOomTRX2sd1VLlytHRTxVtxU jk/z6gS3yclr+k/GXUtG2dfJ3ZO11CMWy7CT3kdrK3/SY0H7msDqE9+xYY0LsZtPun iNYoxyIcwB0udC211DxVJ8KS6fizHfV/ozy27r8W+sJXzgbjI+iNke5WSVpIvW2eN0 rxQ1QddStM19J+El0ECTiAhRPZsSWCd22Bg8siolMAwkR+34Em0BR/hnepCNnDNpt9 uV/ZxlLPNmZZnnglVehEA7FVuu57ZR62gtt9q5mWwFNlJp3jGIpXlcpe1sE/54IYEg U100Kis1f3jQg== 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 v2 23/79] staging: media: ipu3: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12: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/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=1619518538; cv=none; d=zohomail.com; s=zohoarc; b=XaAy+G0GO77sSFv5+aZk6E43gDbNH7ab1cUEEO4uMmU+d2D2Igs2St07ll0/IdpWxJzeen22t33V23Fp4YLy5SKR+x274JfRKkfijoVrQq22HIJiZvlH1qzxkxu8oKWxkzbNXQPCpaehUwnps/Bei8FjCGdIGobnYhk7BUTwVZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518538; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sXS9N7lOxdaSuaR1jnhTDEntcWdQ9KSZnVkdsdKbNS0=; b=cAriVoIC8hbqjY+hMybMdkCOaEebTs0A/4AmCEhaDs3kUu8ukRb9QH1jMYJxFIvLBaTwOO3hW6d+h9x2SuFUHYW3hhTJafQK/6CHcd987IIzl7a3FYkI2L00lU9q5JfMaIKVMlgPtIm+5T9f6TIDtcTVAQVhfOWZvkYY2Xeeb/4= 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 1619518538009618.7635751856197; Tue, 27 Apr 2021 03:15:38 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235468AbhD0KQR (ORCPT ); Tue, 27 Apr 2021 06:16:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235401AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6AECA6140E; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5k-5k; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=P8ySBvxIssOsYGuosUcRi8p/mrvcDEnJfSep5KVO8S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eONmV9/Mm7lWd/FtO3g4WINxflJmJtpHA4XFXzVRMKKfXnwgMPS0ZH9uy+mCadeGT 5QSjs7E/k4dNVQiEARQRV+kSDoxicT8oxEyt2F6E6r0zC30sPPs7hJncR+mzDYaK4K Xi6kseIxUJtpENi8mAnN9kYD+aj0msQWS6CXByKWHJVYCKVKJMGSMyNN8xoagrFhpe +9hw/9R2IbfXDmUz4bz6ZGtRRxxs8g7phPZipI9btpAMp9eHG6nHZGRoRAZsG6F53b jOsD2M+Z+er6R76BlY2N7x9vqtpaRTS91Nrz0UVyfW4cEmADsEirufNvvYEnrq9fFK YbIdlkb6tBtBA== 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 v2 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:51 +0200 Message-Id: <3c993a816dba970cf45d7d9ecbae8b13047ee18a.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518556; cv=none; d=zohomail.com; s=zohoarc; b=XBh2G2e4rSDO82K59jNqIXuHLgtQjN/gCfcnAy3M1tBEuJ//G8DLlqLGW5oZQN1d6W1S5rCcdPYWsbDl93EByfNg2RnZN2uC4nQ7Tdlr4Bjt+FTnkoHSTk+8OZkxDFlq+gEahr6+Lztdoo7P6KFLedatlNfVRSDBxjCxu4e7HqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518556; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4MHdtY8j9PnnXg5fLzOr2wfQzo2yPTPoUTUBaKcVnz0=; b=E9Zrf8SJS/GicYgTO7yFzXAYaECWOY5dXRGmA4kmTHTkKqAo4lA8eq3OAP2Bdn08ITHhH61MDAj1zFtuYsFi8LSYyxN25zQf1nrs4ikD19tOZ31l3RiIoOVCpceXja3VyHb6OF5u6vzkm7m3pL1U9XAwxLvKkcXjjIEaekMaQME= 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 1619518556273661.2159505399569; Tue, 27 Apr 2021 03:15:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237847AbhD0KQg (ORCPT ); Tue, 27 Apr 2021 06:16:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:34668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235398AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 67D4D6140B; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5n-7g; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=eeb2tTMTeECwFCJsmdUEhrGisH5F5adY0i6Xu5Zdqhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KExWx6rx38YnCkcfolMEeFFyC3f1GXJQvNGjOa8ISkbR1/jXcHswuOaPWK3laj6eV tt+pFqegEsZAdeviptiJOw9VCfKsCNbx2+MgXFGhQs5noEb5rkJP3m1hw+p9iqJofK rhCFOkmcpLsaPSr/wIlK7zdmr2bsOJVytIIhT2Z9OKvSV0hEshOvzH6lyd6K1o4SsO k6xxJzUCmJVj4MLfedSVbX2lXO9sq8h9TS+Avkw1cYti/1+TNpExRUMgIkYjFeVR3P Uk0fA3aSskJvOk/fxln8CRVBHdUUahj3tHLe4pF5YQ8MbFbVImnqsNFYpxlaLWIosK Fmk+pGKIlDyog== 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 v2 25/79] staging: media: vde: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12: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" 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=1619518564; cv=none; d=zohomail.com; s=zohoarc; b=FJpdg9ziVk+T98Zjw7pTnO6Phl7Rm4lDwgBgvxgKKBSCZRHdemcuC3Wn/V7hNrFQSNqFplFAQn4kFIz3xGPvVAGCOE/4q7m7DYXzcgTYyzf3yYzCJVNYyGojxL6zWyG4qrWwvzOMUmQB6XG3rOIT3JjvdLUrs0Re1KbvUmB1z0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518564; 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=X1K1UvJablNcpAdyDGLVVA9KkErTCX+AdttzAn2r3xVytZoyCune4yOZg2wkRdKTqn0FZx5naW7sWnl+ZDsStrHIR/lCJBlCRRhtlEktiDW1tYMRL+cB6SxA9ZVLYTsTLYHQ93Dxi5KNBWMd463E3Bh1Iix7EGh4lmg2iuUW9HA= 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 1619518564609816.7988349459835; Tue, 27 Apr 2021 03:16:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237901AbhD0KQq (ORCPT ); Tue, 27 Apr 2021 06:16:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235409AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6262661403; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5q-9q; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=WbRKhLLskO1RYUogcibQypEKrmLpBP5nHtIha3xX034=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1M5s4+mTVC8LapJnRqHHVl6tIlFe8dMRzuurZ0JGjJF7/XQXAKwYv9WPelhIxukf FfQTTpJmb5Gi2RqPEN31aaE9dS3j/Xg09vEGHw3MTW2tqquJwbXmKKdbKamp4LZ4kz VxgWVyFtWEixuLf0en4L9G/x7quzDJek3hpTJ428+3yx7q/47OV9adcZvOrgxufyCx 6eE0qgYaRJsPV2Bci5FmTyctDigp+TOPyaYjV7xQOsCFVP4LVv/heYncsjh9cjk1h3 23EMTS9fk5hag+zh/BoJvN2kQaBMfLahY9rU53iOx5awmd4Bx2LuWlwk5TUQIDz25D 0AJLd1PTqCvtQ== 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 v2 26/79] staging: media: csi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:53 +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=1619518571; cv=none; d=zohomail.com; s=zohoarc; b=KVAGAHZQ6wR7Rg4vQOwtHg3D15XbdAUprPKMkuPYuQl6fbL4R7KlRfdOJUqsbkWBrNP6h66gvYA9gMMrBhf20LEnF0EruVKpobRs0foa6XqyheCROzJfkDJ7Faj+eyq1PKFA87FrTcBolXBCxXWPDvNsVauSRiTXxa5k58jfLYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518571; 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=NxaSR7t1AskC4jMs3oY8pXluYNrfuuklnvSuHKIFwaiNrGb6hAk53KSnzd2OjoCxrztYS0bHEru4QOKzhvhaY/332er/b9WgELu03D9yq5grQOcXeFwQ+5AuXBv7JI25qaqYCGACBFfgkzUnv0YdrfkchIVf4Wtdtllr0GlQXlk= 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 1619518571855366.8015623473916; Tue, 27 Apr 2021 03:16:11 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237934AbhD0KQx (ORCPT ); Tue, 27 Apr 2021 06:16:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:35286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235422AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9420F61423; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5t-Bl; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=ilbYi39Wp/s1IHEjQb8NZRh7PLiRnT42XXdFX8lFSpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GorLOEPEa0VFrfl3YhH/WhQp4j220WG8k2/2qXdiwsjyK+NYdV71gFScz4HuFxP7L 4Na+7Nutkvgb3hBA2yaNc2cM4fRONhA879qJHYnxIfzyW2DhSlBV5DQkCyfcPtcmKM FeJDG7o2RRtZ0Pzlp1p6JzUoCwAYeCH4Y1o97xJ2U/BtZga08PwqblS/gQ1c5hLmKt twcIYayqQqSXZQsHZHUp4ULYIXYfNTAczL00WmQGavX3MkW2FE2JEaG9vOyhQC0xhL 4JS+a/NZqne/xU62rrTHDOCN62QbD4Yb5cDEAbhOBT0/jbkZzwIJxN0t/iw0LN5rBH 03ZPMkL2vVFTw== 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 v2 27/79] staging: media: vi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12: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/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=1619518558; cv=none; d=zohomail.com; s=zohoarc; b=GkjG23PiCwKHyHfNRq5x30/XVUSg7tkdXmG2bBjSmecqodoW11yvQ0Qeay/JQFAc47MFKxaNvfk2Bn8+DK/yhqzGhxy/ISLSCKx9FLk2MAjrwK0e+YWweFniJlPFonXTXhPBNR0/F8vgtD1k6CWnqz78UFIRWnrMBdGFhqSTFM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518558; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SGETvmJFs0ZQFQn7FyWxwpvIUEXgYvYAvG0610/gANg=; b=ZytT1jPeCXe0Dq39odElZlUUNfmKhJf6WKrdNvpVJ6K3w6CmXcTWzE/6uJz1/TRmcaAl6IgUX/UyHRSyGhyUyIrMfeXXrNQ930ziQTdA65x34jWupoVQyjENLzrH07iCtoXLBUxNKBoXnjMSaaP0QmyZZ3j4ednZY1uJKw5Z548= 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 1619518558516589.2734398225266; Tue, 27 Apr 2021 03:15:58 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235303AbhD0KQj (ORCPT ); Tue, 27 Apr 2021 06:16:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:34772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235411AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9103C6141D; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5w-De; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=x4LtonqYrT7G4qNBwEeK0f+06mohriAA55Pys8MWWx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ThlIj0bgaQ5JNijB0DqTP086xOCFuMElwT/wQ83t8A/dEKelm/q1WVUZmH8YjbogC Eg3axCSTi1Sj9ChxVZKznv8Kv6gEjjt2aY09omvqRbg25r9vmtZoqgGgiwQG+Pqwc5 +3A9zuFIiWx3fXive0ZXYcXIumuuk9ceqImYKaBibQi4CetU6Ips+3W+KHlM4yFB+/ RZTGOC6eRRlNUhsQhhrfVpDVxybp7rDJOcL6IQXqDo92ZKYz9rk6fBE2hE/gYWIpcc muPEIR1MWNDt7rCyyC0TsjFOiO6sngnwMGYjH9Bb1J6klnJQ8+1ODW/HxVr9STX6Of 6FXg+GzueGCCA== 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 v2 28/79] media: i2c: ak7375: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:55 +0200 Message-Id: <0e491752d45b9d6ece815cc7ca7dd1a2afb17810.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518597; cv=none; d=zohomail.com; s=zohoarc; b=XUylAdAhzgGfc04eQipVTgKPw6mwv96xucM2VZNodSeJ4gwvJEHLevXwhmFGLuNElEYHyCUXL4rXNUEtQMkfs6glmwkjEecbWsTtApRxbqpoLlfBgOiwHLbIrRuJwxqoQZXpA3JmPRlI253Vom0IcgjLdtKRQoj5FYWFvMguV+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518597; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TBqi5I8m8W12VTJAhfopvdehjd12gjfw2XGWAgPbfQA=; b=PolviQovFGl8y/sQdzgltwAlt5TZp5F1o0aiJDD+H09C+hI2j0l9rYAc9KXTkAnremwdtEiQoXuvdTtzkr8nP6+bAfBAPIcU5+OY5B1w3S/UA7uN2XHXN+qr0bm4Xw+LuqEWW+EVqobRcZtF9sPaJRwwc4zRBwD9nFYECLWFKRE= 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 161951859734035.804825303554935; Tue, 27 Apr 2021 03:16:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237119AbhD0KRT (ORCPT ); Tue, 27 Apr 2021 06:17:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235430AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C6D8161442; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j5z-Fa; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=Brp5bgVOD7UqAef4tVuj+33Q8jgTwnd/UQoPNRzNrhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2OZ6v1gRfGGO3OQiD+Tb33Z+AHzcj0dztciHtEW+Cj9G3+tjVJRzCZj37ejEPzSX Yx0k7N7+rmSl/KYCFWqVXyGpWjkDpjBNkPBbblDdw3NBsrpHPzqJkppNx/oe6ehNMU +Q8DOhs5J3NXnoERt5w9HJx0LhhmnE+eYkcWrbMlfyuRLFOwr8Tc07uAUtoEjQbeFv byPg5AE34dheN24ErtSF/PxlJAskrJSTtdurfZ4INggqcjgx3EUap7qkH2SD+HqZ4I SagYnZOXbevqX5QGortcxmfQw7bNYXfcntUgKgThtWzp+Sz+4BR7lLWAcSozrqF4ha hPclnOX9XyxJw== 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 v2 29/79] media: i2c: ccs-core: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12: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/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=1619518576; cv=none; d=zohomail.com; s=zohoarc; b=atfJrFgGwjvH55IOJaYQdheyAyyYU0Z6EFg59lblU5SNMiECcWAnKDb3KolLg9pqiAHerKWDzo8vF7X0jk1FJ/Lrn3GI+SyuRowzk8TYfhTYB3VdH+ANRb2U+HLa9TWxqnI4pSauc+j99VFzwKGGMSH5FuvvhvM73LK7ScbDxuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518576; 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=JUPzlnjF6eGmo7lGKy1VXV/Mpg6Z4RZxeqCdgRFuWTq1CsJ3CnSiWc57/VYF/sAQTQel09NNEs++lHql7O0+9m8KM0v2KA6zQfERsQXQxze9YQ2mZCUnI6NrDdGXyo6Oj5/xxN1j0PXu4fkq6mwtVrNbWHvJoF+eo4ow75uYxp4= 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 1619518576168405.21754680348647; Tue, 27 Apr 2021 03:16:16 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237971AbhD0KQ6 (ORCPT ); Tue, 27 Apr 2021 06:16:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235423AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B02D46142C; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j62-IH; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=yvRexqPmybCXcMQCunEHPJjJgD+ZEwM3R67ntrsgrMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N48R0GFKuE9aS9VZ00xqIAnZ5la2kqQKiP/4X0Qp5Yyt5HtGfGM1IbN0/zkX8FGLk 4a81uocMMblj/95zyrWreBFQPPrsVQpGmVGfXEFV6GoQLc6G8qD6g8pQNtXny5MtyX 62PTMvSfsxlorZHR4uL2mBAENrMjhcTokXsvx5f7XfyDSGDzpGR8U2ktTk/2K2FXIe fpde5WJAXXcSO8fo6J7Ov49iYjsBU/3TqC4ZqpsOfejbolb9RXA67kXolXZFh6xAI8 an8SDqMC+ZwGzdMiz3MCWlNrXHuM7iZ8AimK/BhyiExiUVa6x01GdZ2w6EXOypXz3O kwao0D2OgpLIA== 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 v2 30/79] media: i2c: dw9714: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:57 +0200 Message-Id: <8021ba367d5bd9ae02a8ae0d18323d3181ed2644.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518585; cv=none; d=zohomail.com; s=zohoarc; b=HgXjsubvm3fJ/4RB3w9MCufb6Synf7ptVAqPPo76ALDLGPTZgQoLDqgUheCAiS7P+fZKAEDLaxGKv+96VaStZNUm6u9NT2hK0sAgZtru5QUnaRtnxl3GauZBC94MvQfACXyK55r8YFWxE+T3VQFPr62b1O/1Pr61TZvR0CBkRQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518585; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JKzJ9TFnOeoXIC6CtCHUYAEwiE+j7oMVAOexb8j5U3U=; b=Du3BbDYPFtbyJeLjRstTVfzRK2AaXd0TYcm+Q13OPUdXRFXhfVIhaxqa/WfD0TLmWZ/LyzuqQzCSa4iJIn2nAKeWvSk5ipY6KxbfY4I/orPztdd0+1TyI268w+MfndsMOzYGrKeW0RJZrY3+YGFe+vo1FSJVijVUYJQQffohWZs= 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 1619518585135669.0092682354524; Tue, 27 Apr 2021 03:16:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235466AbhD0KRG (ORCPT ); Tue, 27 Apr 2021 06:17:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:34864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235425AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4FF461433; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j65-KC; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=0+qUTNue9hnyAq3YJfJJPyrh70EsjiwzWG3y47ywjxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4ONUu70heY1RZmS/I3mxnEG/VIJ856b0NmRgjgVlVaABKOTYSy19WX/Rou3RI6TZ Dj3rh+h8FahVzN/UQARVcBGNw3g4Lq5zbO/cTaMKT26NtseHWBXT1pwPA3WCI5em2P KE+/o1hfqQv9E+VQjl0QLpTefmTm5QtXtOrhYbnhKfXnNWj+oEnwPFY5S7Oq+rq74n c/gBxW6lEQfmzXggv+1A36vRjqLF1IhnMKIVh9lvd34fbLz8is/6ojhEf/HAkN37CI kH2KXbpplN1X46PtVXtrnAIn+BKvdXTKJhcqBd31j//DeZGqHHrbNszEgN+8xlpXcU N2lV3S3IConIA== 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 v2 31/79] media: i2c: dw9768: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:58 +0200 Message-Id: <951f9765516074475e30e10dd56ab7184873e77a.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518590; cv=none; d=zohomail.com; s=zohoarc; b=nDpc24vZnxs0TK51LF1vImnVe5mIvoyRSX9KuMDSXeWFcm0qelMIxmLr7rdwOcZ5KXeeR8P+BCpHuIxl6os6vsmNZV14fdzAnqqVRHtIeSQupKg3U5BQjrt5tpNfWlr40JPAIAIuCOJodEmtTpk3H278mGMz5h0ZvzOGA1tjIAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518590; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tWC98gV1RItDDbsDGxY/cuT3KZgUL732sUSdtE94n3E=; b=TF7l3hXG3pDv/58KxysdhudF4b6eaiMGxyKAviTrcF8VFUqzs8/amJExtym1LhO57YLzIKgxTP0RZxNN4AcuE2N7Hdh7xiWWEwvgcnkKH6Lw0z9ulgvAB42gtJP0X7YzVgugUgStQ9E8HJzEC2kOoglG+7NPtY8KArbz6iYkY5Q= 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 1619518590916448.41984839707993; Tue, 27 Apr 2021 03:16:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235659AbhD0KRM (ORCPT ); Tue, 27 Apr 2021 06:17:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:35420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235428AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B90D061434; Tue, 27 Apr 2021 10:13:51 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j68-MC; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=8oeNDL2f6ftikmJG74aEJuwd7JVkpDOtWW3l23y+D78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pqesKJyKrMAdTssMF7Aa8+Ek9CtV9tgitsOLduPiW/WYrOB8jQOrSiCzY4J1t+7yx KINzdGrbpIxuQqp48Sz3mtNdvD8MIux3CNKenoYKVZ920TdwZB4idanqwWyPYWDuxk QQ6xaWiHO8AH2AJ8vGW8NTDXCFsMEajz94fO39YSzqvpUyDtFmrf6U6UtQSwzpv3ju PBraetRoank1nM7DnkYFxDgUE3MwhARoHqyh53ySCYFXOHPLpxDulgZB46Ufiv8wEg 5BR2CikO08hSbWlZ8tJzVtO5HfIaLyUDVMtyVCUW+21fIrQSvof2WkTAIByzDRE/Iz H23GU8Tjptu4w== 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 v2 32/79] media: i2c: dw9807-vcm: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:12:59 +0200 Message-Id: <7c146960ca8dc8f89b70bdb419d1dad51f686e3e.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518595; cv=none; d=zohomail.com; s=zohoarc; b=J61QTiPIrs9mkmnFUBecREcw2Hg0pcMwkU9efZ1GvQU2UuLzOpw9+plhvY1TO2e1gAtLG7oArLAyy8THJ6IPhOZQn5oXe8gF3BGJkXE95PlM50K5/UNiu/HNZ8n9O4vgY2xs8A7/MiFNcz93jaU2b8aZGUOArw5DOiyJ8YFxHdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518595; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s3kuLH8y4GZ9uTdxpO70S50hDV2GhzUqOOKJqkcOljQ=; b=jPiIRINwHftp2X3SAYhOAHfFQN10abehQeUzyPWP5t4sdPgpgznm06sYa7v/zPE/tFiYTnruESRD4rUuST0JCUwhQO404d1tgs3vI98T2i237DkndMfw4/QLVOi/7pj+SLxKTYLpCFH+u1BOrsrMkTanYd0WGCc3yuN9aL6xDvI= 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 16195185954441000.2843655011271; Tue, 27 Apr 2021 03:16:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237677AbhD0KRR (ORCPT ); Tue, 27 Apr 2021 06:17:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235431AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 062706144C; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j6B-O6; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=28FtFakpR3rMJfq6Bb1gqJsNDZKdyp2sz2lduteJODo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FPNbE5nvd5YpPeTBT2kyoogDBEOGld3+cFvgZPDqTIwA3lWdLvbhLPA2ZfzamiY6+ kThoKGuHEXxbZWscVB3AO73vjTt4sQRennk37o5vbn4MJcd+hOTYqT6PT8DPm7gbG8 ZInVnxt/u+MkYR6AQjHGQjIhOwihuNR3ZLrcdXZKcNJioCHdhjH40sf1nQO0v4GlZT hVZs1hGD9YvQ7LRGL+8zwNbbi4W8UxOuNWtsiYp2YBuUyvkp/ATFhlQvfYczRIVa6d NUJCHCQAoUDumszlC+hnE5HzQVtlSycTrS9WJK7TZWS9X97izW1y78epDX/EuneUrc zGic7iyvVlWDg== 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 v2 33/79] media: i2c: hi556: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:00 +0200 Message-Id: <76930655db6343fd23125747fcb0b6d6a011e3f9.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518616; cv=none; d=zohomail.com; s=zohoarc; b=ihrWfETFPQAxAoC7Z11X/RXhzmRPBwa7ZrnlgNfOSu8SQ16Wx9uDOu5OoaSIzCAjW+VU8EPXCjCH1iDqfaTdKjXuWbJH1MdfxNRAZYpb+3YM80UjEdVIV8U7d/xRns/dIVORT9AboExF8wlkr5RQA1sT+6sxwE9jHWEhxlS0bsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518616; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A+aXzeElgBgUI5AVlv3yHEkhge9yq5Wf4aRJehbm4xY=; b=YREYcl1bwBSoaXoNozx8P97jG6vEbansroRQi4lzG2G47BiuRm+2h1+mwVoPtbiTmtkpoGAInBDiXUU8UlMrHDlQgTEnFL5ThryFXBXawIR0JfQqh4+ghOqaox2pHkdbh+cYbGAliZTwrWNYsiA9WGADIP5LCBTM83Z9QG19V3E= 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 1619518616220758.090614487573; Tue, 27 Apr 2021 03:16:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238028AbhD0KRi (ORCPT ); Tue, 27 Apr 2021 06:17:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:35522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235442AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0CCF76144F; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j6E-Q3; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=KnK+ScvrOSmF+XC/C/B4F8IBvu/svp7LsuDeKcM5sXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kqihrh0JAD8KKS8o/OcOWWXmdSVGOb2l7EZAL+asEwxCgNzzBP9iouzl8SVV2Nwtv RKr7CVPyKw9C5z4EnbHXn361hNTMJh3o/jZ0zvbfTldYf85U+D2VjNR7c75zQ18NlF OyWVEKUe0+zMKR0BwMnOT2v4JUn3qkkRiqFfcBGD0hSJx3aA3DRq55nISThq00a3Y7 P11MfLAyQKBgIYyd7ODtpOHSRHBwzeTLk4w5FEgAVRsldBpqtnbU2XHfoKR896Rw3I Q2i+TI+hkg3PJYog8TLDkBW5Y2hP8HN9AYSLfBfE92osYzrt4ZaCWS25va+Kmcw8Cg Wv06c43fhslLw== 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 v2 34/79] media: i2c: imx214: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:01 +0200 Message-Id: <0fc752194f213f2f97b7bb8c8e89d29c0d10747c.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518602; cv=none; d=zohomail.com; s=zohoarc; b=fEhVRTIJrAAEf/4uT92pdKJ3xWopTrqIvdyRnP8uMewY8Te0xtIlz7DHDC78Evx6XFriXbb00x7ppVEsRpxVOg8n0VzBWWCq86o5ICnVdSc0LakHRsACBqlI5tX3tCumWmq1n4lvoQWU2OX+2lpcYR/SKREOAb/2bcUAKMJYihc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518602; 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=MSEmNFgrEvaj/klitb+3xRMwqUcpqytY1VBeYVnjVEV8PqEZDYEIq1hIabv9UZml7BCJYDIqOgVoDtSDezchxL0R2b/ezHNMiaMHgzsimr5P2TVw+/VilOXCnGcNfBxRvn+cZcuSP4aR9zAFpcxQ+H0vzlyBvQff4lGAVms+czk= 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 1619518602354245.3207579458906; Tue, 27 Apr 2021 03:16:42 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238000AbhD0KRY (ORCPT ); Tue, 27 Apr 2021 06:17:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:34882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235443AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 104C861451; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j6H-Rv; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=nPYpAR91E3rgdblnM1RIaAoqqFVi+fAvcFwJJ6A4j/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nyB7zNaYGZV4naMl/LDAOORTpR91EAqBlvt0LS0ik3sdNk7RtxwJ+auTC0lI5nRoO pAA/5g7xCxr1fwn0XCfeGxu6yY5BRWLO1ie2M1hB4k/rxhpbl/Nl3WKmudUyFqBwQo sSFoiVIj+WjEaFifqL71B7K06MfMPpqcVjgmY6Na7x/6Kunoej8tnrywf5fpuuJQ8q DmCf2Crusd8EMQ9k3C81MVmLdcFJc/X7kBN0EJ2iUaH8ErsUjpfqaG21S6ywV/6o8N th481aO8jWp0YwHn1Q6ATUJEnmEhVBMUsTLmufHKDyeA58HzfYRh5AstGIniguHOH+ puWq4rbDC5akg== 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 v2 35/79] media: i2c: imx219: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:02 +0200 Message-Id: <7766f23539a0a12f8e76cc01477cbcdc6013574d.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518588; cv=none; d=zohomail.com; s=zohoarc; b=GYEogrKNZdkbW2GDZeDZNi9tM7VCbKROP0W4VCW32GKs6x7fRklTKucx0N8YCY3xCNiUDFtxpdfJ1OdUO+s3Da6EHKA2AmKc64rj/V9LlefGSS5qoDvfIfXd7bq54QaktoiwMoJ00WfnI81bBAKTeYr1LEJWtnzZnhSZ/yvLRHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518588; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H8MaTp6hfkElAFLZeHHKfZ6ROHP18nT6aCohBEbVvGo=; b=RUV7pvSy0ZPVi7Td7P3eXJEg/zsUQX9vSUq6ho7S/5C1ntPv3phsjgcuh/GTBIgPiCjbIuteKRHpb+D+1aCDi9hV1dUMJmJBYuW2FUt1z57awqgmU9seoAK1g6d1BXdg5R+osVJIu41u5zSs0TVvoTJ/JzKDZVCxc/+Rf8H8hYg= 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 1619518588611143.45822677438036; Tue, 27 Apr 2021 03:16:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237897AbhD0KRJ (ORCPT ); Tue, 27 Apr 2021 06:17:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:34866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235426AbhD0KOg (ORCPT ); Tue, 27 Apr 2021 06:14:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 038506144B; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j6K-U9; Tue, 27 Apr 2021 12:13:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=eHVLTLMHsH9CniLLDWRCODM0fRuiKeyCHa5RZsztWV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JMlzRJhmQiV2TJjHSVLzxIKJkvgvthi/G4+CsNuxYnl/xf7F6qR5Q2N593QyHX5EL 2JHbxXCdH1bRTCWER0n2ynSM7sj1HfGFsocvB7YpEQiiAEp8/PXyqlTgGdgy/tFJar 4V1T+l4Sj0ejslUpQ6g/pRmDYEnwTRbUqI27AgjDhM/kGi4anf+UXtUAEgBLyqAJvf 9MUIQAj42Y/4Li7UJAENIgWUhtbVnidPbK6MxdzYuQQLWIlT10ddNdEGkk7PJIhC8e fq+bti3bS0F6QtXd9JgjsB7+EDbDimCM1Zz7+1zOaNmzyjmmR1bouiHRey45Wfnn/d yuSKyFL1+kn3w== 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 v2 36/79] media: i2c: imx258: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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=1619518622; cv=none; d=zohomail.com; s=zohoarc; b=Dj05PIsqUokD4XEaOF6Cxmm86OvTg74ThojUNnqu5G0OLOctEFNAYu/EWTukyC5muZeYMZHJkhaC1fF/TjOzHMx3XvnWDLDYPt5Agayo6+OYMKazmapEwahtIepuj0440kNTl9rpvFUz/LaxlWIKEzwz/qgCYFyDeR+9fGKDkZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518622; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YY+9ySulXr3xOJiKlXEpT3t6C05wB27OdcqmX73YmsU=; b=CIpZGQWVAYVTnWe467gTjSTtxJ6P8rFNGqUMxv65zt5ofCxHAsc19+ERLkThLQ8lnMOqQEP6WwqawmA4UYJmTWbgnm8e16kzLecbBjZocVje1a6flei9HN6yCw4T3xqZbi5uzrbXAw7mYPgJThheVt9Gbs8DAbhChh6zRG8f79M= 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 161951862207853.554583988056606; Tue, 27 Apr 2021 03:17:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238029AbhD0KRo (ORCPT ); Tue, 27 Apr 2021 06:17:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:34862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235436AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0800C6144E; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiz-000j6N-W0; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=RKkiGoCDSW3lMHxV9n7JS+4PruB0khbogVRD1m+DqBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W6VDr6dwIJolCY10j21zp1uwzMJ0eHGRXGAUPe0G3g76CHmhQ4dcPDDS0WKLBzjKr azh3dTGR8k4GrtVdFU7HGW3hwLAKDrnjnF1i06zvSblzjZ+NBuHUgsB6ZPTeJGU56j AUWBd67x3D4W0YwsBHly4M5V8nrnOZVj06Zw0TgRv62SAaSWYeLDu6XJza6dt4zeQc cekbm5ps+D+8ZxMVq10zcsaCXw1kcuhUPBh3VgJ3gc9YIcujOUFQAoNxb+YfxDIS0N rbL8GgQtiAv6Tc/0dNfEHrOEy3p+5ufIvJFzJT8RYkqN6RGiOI1kRTSHJLvZYvpTVl AfzW1wZ6uMQDg== 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 v2 37/79] media: i2c: imx274: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:04 +0200 Message-Id: <85bafd645269ad1e5392e7e113483563e28a072f.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518600; cv=none; d=zohomail.com; s=zohoarc; b=T6d/7BUXqtAqyFh772ZxDG/dFlXYHHa0vuJeA5LXPc9PLkaXQIMXjjzQuPU2tpzlEI2fcGeltM5M1hxIJ0NaEeWR0AuZqH/Y4qMsjUHYIc4HE+rRAsKi5t4opTcbkaEdKQ4zyyvcVu3828yh3iHWkteYv21m5YP5U59dA3DLmWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518600; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=47HdIqjUJtGUwQDpLtdDo2YUdcfQzgmDsHwVdQxtZ00=; b=eBO9S1Weg2KVQfXVi9TISjhbyyJXrvwiQAcII40naIhzUDLSs3UEnActcdlRVKHBYaFeiV7Yp517TibgKHXZtNHrkFGi/8Jm5FAIrbNmBzhm5+LzWIw+jq3oJJDTWjcydlg1yMT4JJLiKSwqZyIouCN71WBRj+znjTtn6wiFE68= 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 1619518600544835.6375173606118; Tue, 27 Apr 2021 03:16:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237987AbhD0KRW (ORCPT ); Tue, 27 Apr 2021 06:17:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:34910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235448AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1114461453; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6Q-1a; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=uVFbSBsOFTlNeqpthO6c96NJAUfPhbV6UvOttxV6+5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMxx4QZ1wblnRax12rxqlfmVI6OonFUFIxBAwyWwJ3pz6pnkb6ruIebihD9aK+oFR wvLCwbyLxVJz+4lF40kW5nJN1iomAGMJ7WKem1/CiL0+oEktecUTvccPNzyWm0wac+ FZSK3vOfTUh92K3MM8ZaSX5soUlr6+BiKwMWVkq7nWSFOhPackRsm9FfpGvLQ/bRcI UZnWfEik1YYgpLTFb6KEL+3R0cG71I9gadY+nUZ1iRaGThbNFtoTT3jOV6EZBntv8w UDBq8O59ua3xMUvjrhjyrHWjucEByB+MAJqbrwGfN1ZtFQRZw3Jtm5BoEA9kvZUzBJ /7CvYQp+9EHoQ== 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 v2 38/79] media: i2c: imx290: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:05 +0200 Message-Id: <21ebf28de1f7f0cad8f6b2589aa1272d78a764d1.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518661; cv=none; d=zohomail.com; s=zohoarc; b=bDR7S7mjDxrOyd+el6BLRTY2JaaD5O9bsXQVmVRRVGNhPDqrurQmWSphiUYXqz8bgDQAKGMuH82v3uaMfFKAM5KvMEtMhYKqs0nMix7ijTXaMflhkGx9Qk5wiO0UpTDvhNoiyhZPvUWqOIeNgEtW/9m5YjlKHfRwmq97HpmfL+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518661; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dSOEoM10daHE4l7vWm5N/lgBLlAdUfkgG885M5nCQIs=; b=eaoRDZGLZwtp7clSH1VCduTVMgW3znnDlxsizbDpzKRHbqRzQQe9rQJI8sclz0NCrrDXjKF3h66XvUYOq+lbUiV+xEe/20GPwCUZZ2vcBR5ScR+9Zf3/rEHx9Rb6f9JtMQWBN9yP3gnRU5LfPOhMrCZ4r+9kp6JVbkkGvxK+34M= 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 1619518661300664.4557402527583; Tue, 27 Apr 2021 03:17:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237442AbhD0KSW (ORCPT ); Tue, 27 Apr 2021 06:18:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:35440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235558AbhD0KOq (ORCPT ); Tue, 27 Apr 2021 06:14:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E942161864; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6T-3i; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=6SWDMHkSlrYNzq7GtPd5DH9pbQJCAbHbxO2AKYAv8vU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MK11RwPeirCdiAyVUeqqhauMMB1T+1sNT0tn7okuvx+uNHbHNP9KJ6+MPTKTqAnwI mVbYJFubDdrYxX0Cato53OfyH0hn4syrPQoKowBGLkPR47JVzeYYlHWEZKJYUE5zkw Fd4Z65y9BIvDIpHzb9j0fNpbAY6RsyPyNc1xEmGUIBDVi4gm/yDklFrLuxtvqgQP2K MrrRoTvlk+cpjQpuRhiy84ZOlAxM8JGhwrDQWu2/qUV0siPS8MWroN76+Jo3JYcRKo ULHz1o9nIJQa6q9g0pC8762lzZ2j5Zfag5E9DwxG7Lrqz12oKjSzs/N3CjV5lDDhve f2zD/UKPoafpA== 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 v2 39/79] media: i2c: imx319: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:06 +0200 Message-Id: <7dc45e7be7d808d638029dd515e972f9ec184f04.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518647; cv=none; d=zohomail.com; s=zohoarc; b=YsQ8dEg/XMcD+uMlcCKPEoOdulg3wIYtKDcNnmbZIoH2dK134y2UVGClFqoF/vNM/bnKOzDA8Rv9e8RTtUD+bLOOrw680KHAeYtFYL/JaIJ4zsRnFYP1EfrzgrkLAVgw4Usank4r9qQVxhnhEuRkzDM7RIha8xpiyvX1A/kn9Io= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518647; 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=Zuo+IxbwscDZ/+yl4hmy9JWL1vhESbudHrsL+WvtSiBRkqEqUYXw2GfBGP52k5ep1r9tUVytAE9L0Z3ll1YZe/0GuDmLapkXDYF+HN/8yeIhNCpQDOYEjwPXxe7oweEZ57P6Gb/zVATuiIdSZTU5p7UyNwmjdzZT93SbMYhxT+I= 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 16195186477031012.0483782803134; Tue, 27 Apr 2021 03:17:27 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237882AbhD0KSH (ORCPT ); Tue, 27 Apr 2021 06:18:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:35286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235527AbhD0KOo (ORCPT ); Tue, 27 Apr 2021 06:14:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F0EE613E8; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6W-5a; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=Q0bHrDKjUOjsdiFC7y51wKhz9eviTnP6n0iV74l2LA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXmG/9eu8AaxnkVHJjjXtDIKlJy2Dlfm2BCZ2/MihqF58VANihAxMazB4fnaqihqz X5PS80Wq3pMMaXMAlwZt0wQO8ztiSgN/sikXGCmH83OxVC6ut5wXOb/umardTQQ5lL 4KCEUJOQMoxjPrQ5oqkVIo3syrsQvIoyhTc+WxOBDZBWMbqzOBexhvCxks9AYXCEYb 7CE8fV44YeJ6H9SSnnBssSKFigYLchpbx5MiZCeGQ33AvGQdnBxyliUSbrQ78PU4qL WGEKSA7MMhfbHOEWYY59d0v389ilVdlF+4NhMRtgTPZfkpUJp7Ld0wHxJCMNV9fX/O v6WQQ4Sza9eDw== 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 v2 40/79] media: i2c: imx334: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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. 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=1619518611; cv=none; d=zohomail.com; s=zohoarc; b=fPSqB8aVSBX3qAlLZgBs7mbmLzyat1Cj1zFlVN32+bjEwPDD/xq6/5zCdgp/NFD14xYU5OqpXTSJcN3U79XTLQxCo436qTnh/JgyPnMH8vbFaolJrgPkpoJadD0WVMxpI/M5Focpxg+Eea7JRgz9vAgWTCfVxsV4Tq7WuRXEImI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518611; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YpAiC3VoZrOyX8YKDbWUeTgNv6/dnRzOTrP9Km56pVI=; b=EUtSzF+iNt0MDtiM6Tsijc8iRK13dcT6A2wZKClFcNUsyEtqnwT5v+tM7dgwRSXUVIAJdCRMI12eLFwlMsrNXQyoGvooYiaKaYH0kBBKmglyPmEVHnIViALuVFK6kXS+NVnRQ7j/e4ofsU5klHjngeD0oMm4wDhx/GsBi5+8l8o= 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 1619518611826910.7569448818687; Tue, 27 Apr 2021 03:16:51 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235512AbhD0KRd (ORCPT ); Tue, 27 Apr 2021 06:17:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:34658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235450AbhD0KOh (ORCPT ); Tue, 27 Apr 2021 06:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 64C5E61480; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6Z-7X; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=M+G2FGvpxz8oVs70Hd7XJ+D2QZDVSmESzfk8hhosPRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b/U4aHCktjc7EWx81DXJGH1oxheYJHms7z4kAMByad6zi+rgimZX/EDeuun9lOeeg iRfgzA/jOZHaArRLaovKttuJUA8CEhO1gfptYSw96lzI1eJuJprei7Wq8XvAWny7hj RkWiqq5A7X46Cu6LVYpCDroBsgzT5YY4yXA8RLhK3bNUBPC88SLOi6QFLnCKN7wBIA uTVOamDt0bsm5h34vJaZkEaVIXb3P0/fsGDpM6jQ1lP4YNkas3t5d8WhERti4XeM8k EtWOpUoVlBD7pJSR0FDZweaHrx2uQofXMvNg76/qGDf70r5giJIG9nZAs4GmibEzGK UZTG191Jc2FGw== 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 v2 41/79] media: i2c: imx355: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:08 +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=1619518607; cv=none; d=zohomail.com; s=zohoarc; b=SPGWB7Vsog5qmtcRO96MFYP7AWxCu5mwiPd9MqPcn4Kn1lWJqVRCiKcy17kHdJBDoImi5rfYr9Ty7MvPkVamEhp6ZPNrDnGTQA0Smxku7PtFSH31wo0Hy42t7IaGJ3CIa2paFxRftScPmnwAwt6MVEGjNW34+GBd69oGIGxrB6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518607; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zq3e8bXLEWKdpdBHiwZ9E5pnO/fJVo9rBE4LqYGvQVk=; b=K1KGY5nx/vEX6VO1xE5NDGDm0P8jBc9VZ5UJjFBwdwegkaplwPalU1wvL/GetP2HIGuUhMy4SWUIPOS4GAF85ISBJgnRa8D3Q68+Sge3fQAMqlz6Ty3BnP0ZQiE+bNLHHckBxJ3IrgiGqs0aYnjSf8aN6sC7i2qJbCeITHNFEMA= 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 1619518607376269.3352071356376; Tue, 27 Apr 2021 03:16:47 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238018AbhD0KR3 (ORCPT ); Tue, 27 Apr 2021 06:17:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:34668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235461AbhD0KOi (ORCPT ); Tue, 27 Apr 2021 06:14:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7914C61481; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6c-9V; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=3LPMYGviydz+wxD+uX1CWPHMq2PRxZGRtXrIww4fEeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P4/sMCZmQma9tcVvBc4t9EiLg6Z7EutWJstWPyPLYZs0vmruKhH86XLPF+7PHB0Xf +UOjDCvloUFlj0PSKUjXqL9whebZ4iwYVejxNmLWF29XgXpJvus8lH9cDSsR9LB906 mRnLPr4yuinFa74nbjytbDZGioxYvkQe0yAs/tsdnNYRaz46SuykdZj43A1fITgG2L pHbHz8E3PBsX8ndg+SSyFnUpARaULxBLHeK0rpfc0Cw7vBCzz8EGqVsDYNG19HIplZ OEW4P117Jbts+nbclxj5PNlCuAnLRgYUbVt5luxvubtILktZKDpgciaHQs7BTlDeNH 72A3WlGbEg3+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 v2 42/79] media: i2c: mt9m001: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:09 +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=1619518614; cv=none; d=zohomail.com; s=zohoarc; b=IJIvCVXjrDTBv38pOWapF2f1a1dslVJbd/j2zTTRE13d6r5NF4d1BHMj/oAXeu1xGKJRm5onfFPwX7dyS+A22rOT4Ng9Y+AFx2Yci+bDXHDUaBeV1ceEtfqDAsQTh6FW1s/VShSr+hYpPPQEZs5iUfzp3rs14yXYvgnIvfNIYyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518614; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ePRQI2425MZQs32erSgY9grVnVeMgLTf/dJ0ynteMeg=; b=gk8XSFLjRHwY3yiZmaMysk37GY74FuDUkN3ywOGb9ftUvDuhe37PVwko+HefUF8nSI8xVKiODYx1Lb1EcJ6yX7eFTULizAxnkEupmBelyNuNJsDrxRZjS3BmS2SA0nOnz2x4tUdgdqQYv40Hx+vjBBjINPkIqT4moneTqas8Lek= 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 1619518614397781.2671485003895; Tue, 27 Apr 2021 03:16:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237816AbhD0KRg (ORCPT ); Tue, 27 Apr 2021 06:17:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235462AbhD0KOi (ORCPT ); Tue, 27 Apr 2021 06:14:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7C63161483; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6f-At; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=rXQEV5ur3+5U6VOB8wAB6dlcXqNLqRBsrKFm5rfs1io=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=szVe35+bLgjyH6l1NqRVWynHhvytkpdYReylGWe3GRQZMyhZ/vlKDhmWM1puNJVpW BrCUAceuJ8ssd3slAfF5+m5LAsTaY3r/SZQp2r1rqSnu0Ra8rNrQbuFVFnklrg92vL noKJxUBGz+hGhpXdajy8vzMcrGpsOk1KJcTEGeg9EtLATK0E5zzyrt4Zo8kLUO4zlT QUQt43j2aikmCdvsygC2/xBd/3Bsua2DDbsdPgEwI1+/PlA6r/0Obxi1/dJV/22dhT 9It0w4zN2n1J2Avc/i5a+nSVElnNLrO2KiWCGCCnxHWe54izZhtHFaYD2eq6h2TtY7 YISNkHSECuW+g== 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 v2 43/79] media: i2c: ov02a10: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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" 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=1619518624; cv=none; d=zohomail.com; s=zohoarc; b=UCwtiEgATKcPY29Qjs365NQ3Tn+A0lKnGyQeBU6OVN53uTrYgKncjulvM6znTfw1fwqj5H+n0EZinwLFejRMlj6hGdhmZxr/3qIBxReNfi3OfRKzJtXQDnPalh7M9eavfZ++rWkOUwiHW8mc9EGFgdk18rzEU02m7jqZuZJzL68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518624; 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=YrvMPtzHkEmcrnXjzs4T8pZqeYQljirU0gr8yu7KPjiGKF+gH5IVmKt8me58IGIaDFfBJuUDGVshsdUMF0m8hfQ3tO3eZ2/lvCv9Ie//Rlin2l8fkoaKGcsAfLZAVpxtAM5dH6pQLR1UwmdY28fIRjpwR+TRLYekYaKi4IpopNM= 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 1619518624026828.4561803840763; Tue, 27 Apr 2021 03:17:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237783AbhD0KRp (ORCPT ); Tue, 27 Apr 2021 06:17:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:34772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235487AbhD0KOk (ORCPT ); Tue, 27 Apr 2021 06:14:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D75F614A7; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6i-CZ; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=cJU/MoL9RhqbU2INYkiDGdONljhoe6cy+RDqPfC2nLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ELIs1156nbphI7yXz99rd0ho4kX+NBAhcF+7wNfkQExPUPihK8fOfsxq+I8Lhw390 mDF4ir/8Kx1g2Oa80KW+2o8T20xChMv5qYtPuBJMu2oFXLavGtMHt1zliyAuYbptxc q417FftAJg7RaKO3zgz32NZyLpIXU6C5nxLrIGasiZt8IKznN1Z4x01M/QBVUSBNPG g80vMOGwR2DJglbOIdo4+j66IGvTHWlTnn9uYMFxFSADjvNjDmponSZNZV9CM5IXDC fz1u8og7GoK+KAMdfoHz960xAadOcdfaYGY/unlqR5kgw0sSA/J7/J3bxx+ntC8JSt wja7EQaN0GGzQ== 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 v2 44/79] media: i2c: ov13858: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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=1619518604; cv=none; d=zohomail.com; s=zohoarc; b=JrGyOr9aVEQSLJCZmlCVmzL8c9cLsp3xH2WYevJj9UW1m3lOVR7Fcaqduc1BayTjvfsfnogAdAQISni52qVteNdmsB3vG3hGKs5bRQIA9jWXDqyCC1L3KCC7T2XWL9y4K9FGlALtQ3/SwoaEvCPt/duAXq3J+edoTff44CPq0zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518604; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FUXGiP5elyNZViYa2pp2JXT6cowU6SRNrK0rxnYX9TU=; b=QBq2GgBT3CQtwV+7N+9a7r9bNxsVW66+BXb6wwNwCIYXNoANlByjjKDneokmafs1sFWrdFa0pF8hoeXDLeCZl/cSB/Xhu3fOIGLNnUDJRHJVNrZV5lLmvxuuXkKYMfddIBYisKfQnY3OXZtNzWp8Tx+uca7ngBUzd0imQbMducU= 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 1619518604780177.0579627882679; Tue, 27 Apr 2021 03:16:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238003AbhD0KR0 (ORCPT ); Tue, 27 Apr 2021 06:17:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235454AbhD0KOi (ORCPT ); Tue, 27 Apr 2021 06:14:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7990261482; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6l-EL; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=YsKm6VExyywU3b8QQMpE5e+1XH7hFzOYFX2Hhhvq5XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tSoUJDmsTrGb+T8mfrx2VUqcb1ou+9GqZOOXAbYPal8QbZkmR43POLxwWgt5ZeQuE Femlt3ehOb+/FrPN8/dUjObRit9uBF+23OukhEZqwXvkFjBBw1IViLZ7lDfzRAiMi/ bJNcFjYQKXj4Mj0WyFWelhNq7a6HwWM+znvOnCT3LDYOtr+UyOpuP1gtpz0qWPlBKF kXK5nxBU7UfeQnhcxnxLZFb4ouOu4iC6H8cvQOhQQxot9V4h+P4n7HrbAzFekoEvOK IYZtrfI206oJPuqvkQdcTil7mlVC64KN3HwdD6Ped9GX2xlWH7nnu+CVizW9YWb4wK TBNXObg71S0Pg== 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 v2 45/79] media: i2c: ov2659: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:12 +0200 Message-Id: <4f2f239cf1b91b3598d1379d7c270bce3ba27169.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518627; cv=none; d=zohomail.com; s=zohoarc; b=IF3t3lcibjAG8c5OSGi7NYPYqaK8WwEOWXVeTJnpf0G2402PLJRGUgzpOr82WuFWAM7VSzXcwE2QdJTKvc1jLJWLndnDQVzs87nCsx58cA/k7PMXkjboG7bx2128KyfExutQOyhDhduD8NuSaiBGmwxYWRg772UkAkNhlVUBkEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518627; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CYi1XA99pht57BbyNfgi9eGyD3etRYWVPM/dlArIQpI=; b=aGBxK8DHNhVCts4MNrqL1RaUl93MfD12UhacggBcOMcCTDlZnd0FU837TgxnNvvKls7f6o+pEZ1DnM76kN3kAU8IRU8DIbjbHb+U28QfHv8UaTC8b1iFbcZ0/laE3orkHZSfqVq/XMFWRJpGtDGGAEWLbgmkBgAV8e/RAGK6df8= 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 1619518627917966.4618021443393; Tue, 27 Apr 2021 03:17:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235411AbhD0KRs (ORCPT ); Tue, 27 Apr 2021 06:17:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:35166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235488AbhD0KOl (ORCPT ); Tue, 27 Apr 2021 06:14:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8591661494; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6o-GB; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=zHjujpboN+Iu7V2XpqIB+1lLAb+rrUx5c1q69NYA2sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T7u+rAp/uxjkX46X8E9ZzzGAMoslnLL7F169mE61VT+kX/ZRdhf7ZnF5sd+d/HpmA 5r+5N6/7U1L3JUZMBLeNez6D2RRHcIOCXHnPYirPdhQvzyXemdsQcA1jGeN9VfnAGs qe3NMhqaYvAxszbN0P45tQ4tPa6lMAcLesoPyX2mLwMihD4ceR6NzqN8rod0CrYJy1 /+82ptY9RNJouCWBQDQ/77A3GNYnIPO+uj7k8MfXuquGC43it6G6R2YuhMvxVcCgVQ 2LzaSASZDdvEh9bOsKGMuXqoxSzF/9qinF1LXxM/g4PxRuYOiRUwxwkxQe12Mn/GAQ KUlza7FxtNNew== 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 v2 46/79] media: i2c: ov2685: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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=1619518639; cv=none; d=zohomail.com; s=zohoarc; b=O1gkdjdKGvVEHp5nob9bCBiw40boSWWcQRO4vXnQWaCyNbWPpOANF2C/eSux50sOtwmyRhWFiwEcw3JuoXToIraJzBlW0gVEhc8YZDetH8NnM1Z8Z++dBM3Uv8JcfAb7nBFET63M8pvDVz3KPoKeMF8PbxeDU7IpQIQ3n4EAf+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518639; 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=NIJHhkng79fJ5kgXJVAlWu36+zXqlpGW7hf5vjGsbMoBXdYEs+MJe1z90mvDwy5iv7CP99BdP3c+q5jLFy51evf3ihOyk0j/MU9rWg0cS7VeUW2Gb2inFfvIdKhsmtmkFXfJMTvxfXCBO+I5YdyOm1VU/aXzTLk2VjRBJziyXRY= 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 1619518639218706.2860844558753; Tue, 27 Apr 2021 03:17:19 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238057AbhD0KSB (ORCPT ); Tue, 27 Apr 2021 06:18:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:35230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235504AbhD0KOm (ORCPT ); Tue, 27 Apr 2021 06:14:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9329061554; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6r-Hu; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=umqdpGp1oSGyna8Ojn3AGfbapFLyE4ZVzg1c+rmxXd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/QaYm0kr8vX9BgjUd02/cY1pWxgrNsO+MXcd0JupGjgj77iwV8BkWJvCpqmAIruQ hmDJFLHdTdk7QD5iroeoNefI8pi3RTTjDK0ZG34edBFTNItxX8YFbfnix2Yc9ASZjN oMYGiYyq4zOofDXNb7UtbEt+NFZG4xNtvDA6VTwvpg8Goo83f7AbHPDUFbUTCnzdxW 8P81dTjNzts0IdtAN99ft8QLWJT3ipr0YC0/n/Bur3SRIQHvkR7ICjhkYRZc2XrQcc JJoSJwejv5GWzILATevpGnDfmiwT2d+Kctd0EKP+qw9FSjT/M8kfcCXSq+KV7GNp/R c0eZ2XCjiQYMQ== 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 v2 47/79] media: i2c: ov2740: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:14 +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=1619518633; cv=none; d=zohomail.com; s=zohoarc; b=J4v4Ferhmp/GLPOb9JSfItEUDNyUbZStita2N0B4rLn9HsmlnfK9QCPK/VVugYaAe0c39RoCgVScL9eLoNoJGdJ38uTalGB/Konkw8uKD591QXGyhXPAZRxsdvRuculqpUnTZlbQkVHewITD3pNd+wFdWBuuyaI6n2aOMoPLQHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518633; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fMPnqzv8RyB/pFyrZ77/bX9UlLHM2eXfJsmxW+ioCL4=; b=CD2kIV2H1xha6hSam41Bi9fCRUy6duc5zWo3/Xa1rm8dvENT3gHcQZ9vJ68qKpBOHxUwylimp4jNfg292XXNr4YbTZRbiRavffj5ZLSxCakAS3zP7hKssamUBhESsQpIShLSBWf3EEESXVFwQDA7g4Jovf9fec+gdBuupHTfg/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619518633870331.9613156722387; Tue, 27 Apr 2021 03:17:13 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238053AbhD0KRy (ORCPT ); Tue, 27 Apr 2021 06:17:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:35146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235491AbhD0KOm (ORCPT ); Tue, 27 Apr 2021 06:14:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D456614A5; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6u-Jh; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=5KztMjooOddzA79l4hTCyOZrgNAAq7qVnwZ9IgWgZxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DN/EEkrHoXuh3/I3c6wzYcjMy0F3HBayNqM1dvtvbw4jPsHVLCUoL0muaU4VFAVkq TvRKXsyn5/Wo7RCtFHkRUdkp8hwa+yAG1103TSzC6UiIDnlgWFcKBUb1jcPsz9sBgT uAYMu1oU3hYI6eoN+8w08l4uNuVIam5N1QPukWxG5VYXT6HonoMNJ1yOhUxnpSdbTG JjwCE9n14sfltYD0qUaXGBanrsBgWTeZr+u+8lWR/0x1QHHbT/uHftgsxiek9CSBFf lEdrz6jMruSlXE2TvPqPJXGtLqXGljaBEeycxTj/yOXObcAFhq2JZpb5mlMaaz6tE2 lcqmK1HIaHE7A== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Dave Stevenson , Jacopo Mondi , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 48/79] media: i2c: ov5647: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:15 +0200 Message-Id: <4edc3d28d3cb8985b012d1a1bc47d5f562565fe2.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Acked-by: Jacopo Mondi Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ov5647.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c index 1cefa15729ce..38faa74755e3 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -882,20 +882,20 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, in= t enable) } =20 if (enable) { - ret =3D pm_runtime_get_sync(&client->dev); + ret =3D pm_runtime_resume_and_get(&client->dev); if (ret < 0) goto error_unlock; =20 ret =3D ov5647_stream_on(sd); if (ret < 0) { dev_err(&client->dev, "stream start failed: %d\n", ret); - goto error_unlock; + goto error_pm; } } else { ret =3D ov5647_stream_off(sd); if (ret < 0) { dev_err(&client->dev, "stream stop failed: %d\n", ret); - goto error_unlock; + goto error_pm; } pm_runtime_put(&client->dev); } @@ -905,8 +905,9 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int = enable) =20 return 0; =20 +error_pm: + pm_runtime_put(&client->dev); error_unlock: - pm_runtime_put(&client->dev); mutex_unlock(&sensor->lock); =20 return ret; --=20 2.30.2 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=1619518649; cv=none; d=zohomail.com; s=zohoarc; b=VOEFWt2FvnBEqdC9eRx++EpA0BJodSuwqXOESeXHlWEPOMeFHYDCj+Dd/XtNRcE8HiCZgHDOSCB96YKk4TGed9okdMzqP0+dQXEWjUbeKi4VcAsqILC2cFaELzQh9noe4q4G3Bf9SUGTqhB0b7XTfRLK1Vop+qr/UJKCK5DZFzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518649; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U/NVyEVih0UeGt0TmV5NFxCGP5Of8yJI8psCw8wRc04=; b=bzD1pzUeole/+wcZKw5iIN2zjh01afflOby10mc9G/9tCluZEcnWfMN0zzhzebd11ofue+elnx+YB3NVB7qOuDRm393P14X0VSkpiLQ4j+SotItqpEdoDZVbH+D3dx1Tlh1L13Skc3Y4Si7ibUjLxeX6+9lDboTXs1rtk5cBL20= 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 1619518649311114.19917564440402; Tue, 27 Apr 2021 03:17:29 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238088AbhD0KSL (ORCPT ); Tue, 27 Apr 2021 06:18:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235531AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FBB7615FF; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j6x-Lb; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=30FDfGkSRFbi6myOhgI3rDKaVJ2tBblGkl0/ENBmv/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XxisjzOhtXzbfuNssZ+V6h0CmLgScHpdqJC0Wf9mArlTvU6Qq7DFbjw3AxvGuxAsh 5VLmC9+Gi2XLNmahDY1qTpWgarpKQLSWRhzAhKqtXEQEbrQmJOqXn+kE8gr99AfkWy mKrx2rJOF3TIYH5ZrwZ1EFJ3kb2hHcjrg95msuKHI2OuIvGeVCvqjosqrrFgUAJ4rc fkpow+OBKO5Y5mgTOJlWTfbJNtN5ugxcKYwtvSsJGQBg5DRhwfTHnJ0QP1iRuMuAJY Q3eAlHGTPOACiAWwIBlN+SJ5J4PUANgPB1DZjgCKizoZ4YJ1mQBdbcOn9v99P5omiW DrCe1sffj4faw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Colin Ian King , Dan Carpenter , Ezequiel Garcia , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 49/79] media: i2c: ov5648: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:16 +0200 Message-Id: <7176c199c0f832ddce0ffcc164f05980581a29a1.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518656; cv=none; d=zohomail.com; s=zohoarc; b=XteIKGd7skEsq/NylCh5SbzVow/9qtcpGjffoR8ZKA4HAVodRHcHS5yMdnYXA5XvuhXkBUdPnKEaqG/GY6d8T1Vqcqv7I9M7nT04N2LKnyGOJxRt3WOU3F+mMPSP1k7EDqEPwNytuhPkWSVawvHoDrvbCbRRwpvx9USv06iC0wY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518656; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PD6DG6VZVaotaBLhBWsDt9p4T7qsx5FB+3z2MjCLIls=; b=Xf+4WtJ5NCKidvdyK4Up0Rdh+loPaLg9inoF4FAHVhPeAwxbSGD1m5PM40nkewAcraSng2JzgjU4RqcUApI711vG0pLVR2qmWedTMzeR9qHn0MeiU2Ho692NafhA3A4vX4aGaVsPCEiyTO5RGBUuixi3gQmZPKirem0L5uAk2tk= 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 161951865643329.431782667648918; Tue, 27 Apr 2021 03:17:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238114AbhD0KSQ (ORCPT ); Tue, 27 Apr 2021 06:18:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:34866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235547AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B3CB961629; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j70-Nf; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=k96A/wu5csXQdkebmEvDXUWzQhtBwXxGUFyh7/8ot0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hw4dgbLVADycQmdwmHlF1MyUVQiS1hu3Vu2aRwx9iTTDx3mYKwdlTkSei6anYnR4i MFm4eXqjy/rWXt0RFHjilmUhBOGp+lYq/j5iC5rEUjuQzrmqa9J4KN7F0I2mvut6YV DwW5NfxLCTE0VoPjZKpArSziwMXVrwvsGDc8zCBwsCglTCjmYhDxl7VDDbYa6kUrxm j3IRqHWb2JafB3MYxx72259pIiLtOWBNJDg+0Va7AVyrlxIwPzzyjbSE7Lty2J38TO xm7sUJzfMfDWdwyIpFL7uwYm7t4WLkw7H3G9pTj/c5tafKwIw+OQlXd+4dVVUA818P GmFiti49uZctg== 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 v2 50/79] media: i2c: ov5670: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:17 +0200 Message-Id: <1e549236f4e48a6ab8dacbf0d3e19d059f11fa51.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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=1619518720; cv=none; d=zohomail.com; s=zohoarc; b=NeiSamTv0cEcsAIuworao/hopX443b6D79HuctTnYgfVqusOKQoyUEKs9fe9L/ekvYMb+94MOZ/PN6yjnYPC2gy0vxrV5zhdyWpdL9mQVZHzI77/kcKWwVbrmWGuB1YkD87J23IbglYCdSC38IbuxCNALvccrveEv5WgLOhKIa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518720; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y2oOs6MmQvknIQx2AD2cQVCBb5wEGO20mgwI9foNgCU=; b=G77TZlknGBxRYxK745xkp7i4BzOjGGgqldQgGlhBocVEq2mT9O7221gDc+vrZ6tFwLd7CqrXivj9+0LyNXygN1EmOPiSdCNPlwhHo+eZPgjL1jt4UCc1SvqQA8rCWx94ELs77UZLu6AfspXIoeDj+8O6xXaDh3ADVEHkuycng/c= 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 1619518720627713.5005333886205; Tue, 27 Apr 2021 03:18:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236658AbhD0KTW (ORCPT ); Tue, 27 Apr 2021 06:19:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:34656 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235750AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A866B6194D; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j73-PM; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=kwIJFx+3BZT7CutnecuzIxhgs2GnXNtjRI6MBhWOcG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dv0x1kYVSnJ2G+tbUPbuzjjJofo2p0eKtSN8XpS9Fr1doYfS3A+vNhct24boiBMKH hJlTXsQvGR9tIWCkLPZQx7XisnWcafsOyWj0vXcexPj94kWu8mXjGaF77aWCPLt9rs J0RLHFmmBa2+gPmdLu5i6NtzVjmHff/Rbm+ghdhBk5HDqw5R67aFhlCnvU34Qkciu7 2IMAReSlgrErbrIy0Le7guymujHdB+IqbIiyawkQOC+NCb4XH51ccTMG447zOlpjVk dL6MyLVfMPcd9pZfqZKOg/qzFsinqem96eNHWQz8YZ7oTz1NwSQan7p91MO2VnPqQx /RzG9xMABPaLw== 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 v2 51/79] media: i2c: ov5675: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:18 +0200 Message-Id: <015ad40a7949f654e4b2722b874682890b65841c.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518648; cv=none; d=zohomail.com; s=zohoarc; b=n5DTZhNYmIGuuotReeXJb3bxzTfXifI5hIJ5rA2y1NtHvghwADN9ZSW1Gj5Vrq9ywayDAlw9tRW3ezO09J96o3NhHij2/LPvXw1tq/AHvB7f5au721dLgI4+5NgEoN740Ve/WTUqKRa4wdmLChJxV4ZBJ4Ybj3BMeWbJBmYIohU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518648; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KkORK53gtpg5nHI4GD7CeMZAQMpKY7HMfjApxsjIT+g=; b=c0HT9tMPvWWLYk9bFNzCG4fNWGCBpETtDCHvLnOVu8F/2X1aOkQ8cYPCsHXX8V1pOTdHLu+JhfJKXWwED/DmsFLmns4oIGeSa3Ym/v4mK/+aNsJ5C8dSEvgpSke6PItN59GWg3ZSkbfFZUqIJp2InvwGlYydwECTYyiY8DpB1KY= 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 161951864896911.99088727435526; Tue, 27 Apr 2021 03:17:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238082AbhD0KSJ (ORCPT ); Tue, 27 Apr 2021 06:18:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:34660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235530AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A3D3961606; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j76-R4; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=9V28x/0yZtyv8nyV8uH7fSioPt4mARji1tVhL7JUs2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JdxzXEI5OVxGEVs1HfWhvEf7coejpuy3bX1jNgtvmn0OaL2G9p62heiGIexGShTLy isnzKD6LG6KNfE/XNSvLJ4k6sL7UzMcdbKog6b86iju9Q7gsBQihvcyq3cHG9RTC4M Wh3jcydfUA3KOueIv05a/Bg3ONeNam7TxWGWoxDWLKMn+OzMrUq1lA803wwKycM+T1 TxnrVlOzQFgt5IlFQXM5zmxCSmZnO4ivJnuWhHuSAR2NXFppSPLuEqNIKzMK//BNEp QEDaCltVZn5VrWPlZtXIbr3V/5FizPlydJVjJB2nU5BP3GtZ72IqijLY8nKA4hiD3v gHKp56BqoSFEg== 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 v2 52/79] media: i2c: ov5695: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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:08 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=1619518650; cv=none; d=zohomail.com; s=zohoarc; b=WuXn1Q1IdHtVdwhung5s1LzkSv3H8J3PQey5hvSBrYDi4rOMX2Hgavj3f1hto9VzDqGmMAUwzC19b9my7vwlgCxPbXvUQD/ayKaWVKH97qlMFpC9tDhR1dKI8ZqNaP6jh2InsBZBpENgdZ1H+oYVgogL8IDmDDQJ/KzHlBVEToE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518650; 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=kCTHP6M+dZ/dwMC63ARchSi/DvWHxkmKfhyQ+K+LDc1TsSMKYwcb9gs75iZqMMS3SfmU8saYKtur1r9hhMWq46+YkwdF4KSsjEAzvjDYrcbmKHb9su9SBpSE7iUVrWwk3v9hXk37gNqGFs9anVfM+dp2xDVgNNf2u9ToChq4puk= 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 1619518650655422.4819699459889; Tue, 27 Apr 2021 03:17:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238098AbhD0KSM (ORCPT ); Tue, 27 Apr 2021 06:18:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235540AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AB6BA6157E; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j79-T2; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=jUMHPV3bIyEEarOloeBBF8gl6HQ5pp77fQglK6LRWcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIb7+lce1FnQh5HyJ9fE7hXJYauthNRRWT125eY/rKxqY4mA5g/ayIzEvuax1XvIW CYllTa6MKMaThVXXVDxCTMr32RKUTi5SVfSR1OLFrkOWX8QrdvJEO3Pc2cLIl5+Kk9 Tr5PHldCihlHiNqZDzoWJurSqXtyBwANLW8cPNXzxOQanPX8rAgQwZhLQ/aY/DUZ2B fIFS1HoKXg5xG0OWpGjAEEt6t/H2EkxTmmN/FVua/Xt+HJAXXsc5lx4i1R1D35OXv+ bdnbYOYbDcsMZzEhZIZ2ayHEHUm9lsfCehQbeajUBzIOdBBup6roz+JLCkGyRn/MqM 44L8p7lkMtTbA== 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 v2 53/79] media: i2c: ov7740: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:20 +0200 Message-Id: <1e08b1b29b49c9c390d29718328f6e53c9310798.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518652; cv=none; d=zohomail.com; s=zohoarc; b=dWuOy4zgq7D0lPoey0R6fqVXXRi0MYMhSa1n4BWlng57gk2GkXq11h1HivAKZSoQzMUep1S3CVj3UlHzDHklG/kgI6QHG+5Vj8uN+7bTy+SCJf9VVtxmO5kiHwaUTT0PHdnztncFulplUFm0IcNTD+ix+IRZaYrhjGsBrYsaYgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518652; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LgkqCMlRr/xDS4uHN4Wn17UWBeRlpBwTqujmM9tUotQ=; b=QmJFyJjiGZKHxkrdyb5BHfzGkJKbJiqnLR83bwCZElpUt3RKJ3VChVyKJgdxbhyol/PR4IszVP53eRE3uykYDL57Md69CtETwoL3XE0yf8zGNCr2eFWKRBl3q/zG1Hr/QTwtYRXSG6jd9VM4lzLyB6XiLWxBTe5ekXe22MKUctY= 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 1619518652726778.071906619967; Tue, 27 Apr 2021 03:17:32 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237374AbhD0KSO (ORCPT ); Tue, 27 Apr 2021 06:18:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:35420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235545AbhD0KOp (ORCPT ); Tue, 27 Apr 2021 06:14:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF2866162B; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj0-000j7C-Um; Tue, 27 Apr 2021 12:13:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=Z0USvyTZ3fXu9UhxRT5FD354jvvwjeNjqwFRY+Zs3l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=miNL4dgF/bGac4VlztluU+MAcrxwIFMPrhKH8et4MrOh2b9TxYJXmbvXEXd9LRAWn g6eyjFp9VKgsq4dMqA426V9E/U7jdncuYKp4rSGFDZH1Hj7Ch3OWJbfbjb89jZ1mGA POGsOXA7mm3AWrXu8Gl+qPxDS/rKVeJEzLyaQIJIBV3pmDJp45PV8SaVAMLkVf7EbR W97/usTyhxeAKcCr5tZw0v0n2WRyY4nBrQyPJ6ffisSNEEnbKheqRclmFbAw6m6jst DeV7pOfjCjVLP2MKLWEFgk/q3kMJuEc2aipzb/HlYnw1nVWLl0R51iUg99AzbaAeUW cPzXvaHHerbkw== 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 v2 54/79] media: i2c: ov8856: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:21 +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/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:08 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=1619518748; cv=none; d=zohomail.com; s=zohoarc; b=nJbgwkExIzQfS6nEhQoBpTTnBU1muRKWX5efg/Zpm4jw7GV8PmlaHHiojkb+9nyzuLKjkN5MqVAlubrMIo+W4UpMWoq/U/2ZyKcBB2KRsX/5n1ozVRKD2x2bGBC6FoOYuZtXt8FWaWc6/ycSz7eYLEr14Y90qFvSUZxOpAMJIFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518748; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l0nFwYPWPiXFHgUKHwaK5u28Bc2/mwKnyZYYdjE5Uoc=; b=G4pNbDHshshgnHrZ2udNO4sPSUagYDMLMLlhG+o2MHvUyeVQFIWKGjImzhSWEMe18th9FUrdh/xKnSjmaZJF8Ia+3DZObmCAHwBTTQI31hTniLAz6b0a8AnQPtEdvHwlctbB71wsdqzsQN1QdhX1hYBpzTWmVBRNTt/Cdr6zqqo= 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 1619518748727796.9183844191882; Tue, 27 Apr 2021 03:19:08 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235767AbhD0KTu (ORCPT ); Tue, 27 Apr 2021 06:19:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:34862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235567AbhD0KPM (ORCPT ); Tue, 27 Apr 2021 06:15:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EB84861949; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7F-0M; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518434; bh=oAi5YzlfFlQMfzPh3wYGQ2xjGcqBCgu57W3dE0PjRzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WlzE8JFKZcEaqtCedGI64mSq7Zxn6b2RQGKEV1UcH8M57TwJqZZJq0ZaTdnJG9Ynf jbsu9fJuzDy7LLMnudgB5ChhqU99RMJratdZ3sLb/vKih+elx5ZK4LtgmJ+0E1+vE9 4XoiCXqQNU9WZUDQjAC8lcjbW/MU/Vv4mXhHhW3MAOzwrxsk3U+vaGBtwEEzAFnEeN 4vVZdUMbCXxwc68I2eoJAf+CQ8NBsqg8ZcPUPhQA9XxpaWD13ojwryu/nW571MJrTz Iqta/mHUbeQ6+P/Pw/1dfH8jFNZnr36SQrwyFWl1R8fOXzk5QAWxTuQlj7g5fYqkvp Y/0Vh1CTFMWOw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , Colin Ian King , Ezequiel Garcia , Hans Verkuil , Mauro Carvalho Chehab , Paul Kocialkowski , Sakari Ailus , Yang Li , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 55/79] media: i2c: ov8865: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:22 +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/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:08 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=1619518657; cv=none; d=zohomail.com; s=zohoarc; b=V6lrtnpM1TbW5D8E3cTjeZcQrpM5qNoFrYmpgVulU5YFTmRrzoSIQ2jmyqNRknhLb0Q+zPHC8pOc7sFXwbSTd6Zqepms8ObXE1kiff5mb4BrkEVJW+u92nuhtuHBlgFGXzEhC1c09mtUEpOLNMazvYS2e1qzdYPfGjtXA5+lSEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518657; 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=jmmhChz/0S2WOPwBP4g5byiTUQaSpcYUB3BoaWhULFfKeD4M6UGZE4NGhUtAy7Se+ogxMizkB0mvSg/qQpAcgqb325s0qgeWwyzrlEWbjTd19QcXSGckJ4YyO6AxGm0SnP3/xi+SKFqO7vJ8UvqWquGJTCRFTX8JQlLNhIatjnA= 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 1619518657751814.8486177673504; Tue, 27 Apr 2021 03:17:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238124AbhD0KST (ORCPT ); Tue, 27 Apr 2021 06:18:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235555AbhD0KOq (ORCPT ); Tue, 27 Apr 2021 06:14:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9DD861422; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7I-2V; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518432; bh=CBbCf8lLczURo0R8ANC6iiJbxWCN1ESFz/X/hIdzJFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YBwcXBVY4VdpZ7kio+28mV5gRRMhpEp5iSmz4wk6pxNYNbF5BnTIch2YNsMLYQUMP u5BbqWGPYCuN8LTPjatvDMyy2jRHJEunQd8/+S2E9/fAX5xGva7r78PgGbDoJTgTF7 rre8kaJcMcGMq8RwpeP6nMzqR+t/REGQzHmocQ023aN2XVj/YuqIAovnC5ncMmfqhu B/7J9cyYfAQB54s7VY3IzEmmqOuxOsRMT98R9SxTTHLKLlIGE+/0U2sZTi1R3elyc0 RPnWjile71DxUi3MfB0kZjwp17jJRVIdBfNUzLZDpimpbegNWw9eY28RMovqMStn2H qNvCzq7ykmxeg== 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 v2 56/79] media: i2c: ov9734: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:23 +0200 Message-Id: <69eecab44bb0d431ea0403ee66f88f2249093824.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518665; cv=none; d=zohomail.com; s=zohoarc; b=BMoXwQ/AvUz6L69+wlfhUvmEtmAWGGqCAxv0a0D+Ca2Zulbfu2hUxW2/tMRmSI5SgtyzoKe+QHrnZz57P7FNGUTyl560iocm7vMY9iguxnSTlgdzQi5mEzIKgkTKaSq9iuOw7sFCWwsmjDrzB+46o8Y5vXLB7jZJJFa9QkW/aUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518665; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MemQBCMDmE92SA4Dh34kjM0Xf+mWVXaAaIa5OPfJXiE=; b=QsDnC+RgzGqx4aK4SLg1m7edrAozVn/qwN94Gogzup0rlDfVHdsbvrCwBaLmYJNXutpik9Mmh5aTYi9f/MNSYumeJ9YBv8j63TTFWTM+xjBNWuaOJ6sXPT4MslcKkvWETXPDRpHFWVwP+dqw8grVpClhYKIk2Hh32Xzn9fWnDRk= 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 1619518665592632.0383250087464; Tue, 27 Apr 2021 03:17:45 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237942AbhD0KS1 (ORCPT ); Tue, 27 Apr 2021 06:18:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:34862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235576AbhD0KOr (ORCPT ); Tue, 27 Apr 2021 06:14:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC5DB61874; Tue, 27 Apr 2021 10:13:52 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7L-4x; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=nHZL/8LfEY59F+jSTZXbI5IsJhAvjS0xN6pbKcv/Zf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=emJtFZFNkEe/8ckj+gnZ8UAE9MqYFeAxmoGamF8Gk7Emy+aLgLZ7a0RBzmPfsAwQj e+Ku9eYBm6jdud9Bb8jZdNoXZHbk6EATNaRqhY3VtoUK5CcMPOHH66ZZseCVXrJqIR nrf+3lXKotnxbSyoe9mjLo1bRo3Z0i+uOhjB4dD5ro6F4kQYBWuvwqgXxw9kPK8DSR 56CUeQNc9ddC0JmbbUYYtj/7zahqN16Wa48d+ONNWFAYOJ6+mKy6ALmtad0iIbIqEN GMNvdP3tmKolsCVYlh/6nVisUPVwmC79UPq05wRuPNaHh5xM4M5IexgtvERvUxahsX SU7gRn+M7vdFg== 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 v2 57/79] media: i2c: tvp5150: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:24 +0200 Message-Id: <436fbea339fce027fb8e3aba09b9eb7e42264c68.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518672; cv=none; d=zohomail.com; s=zohoarc; b=J3n7udY/iebiIpR/U+eewI3tW+WcAoFxrPGbxvpKV1ERgOtMIBXWbivP7LFWyjWghqkwV+OHEKdI95MmrnKauD0MW6rXGxdqtxo2CL7QcuDjYEQniUpy5XdC0e9NUVjjXy+BqQPxmLuF+4MjoQzlZfEqJICqFqUTXYS87j3alvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518672; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6TxO13Hcq2LXkVzqJrqf06IWGakAOWK6g1rNPJ+wpFM=; b=hl5t0U0iWNk5s+fFufsnTjBO7RhQxE/G9GMKQfx6m68zXowkMMzyF/39nGg4xCzJxd/QI91tKkB2D1UPXtec3ASzdAA1hfPOzv7u1Xnc2my66M/I/kURC8dKCF/yVxVa1VdR8xpn1EP1ZRrgcA0npsG/izZbMbIyaZWJ0GwF/M4= 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 1619518672370797.6747409838941; Tue, 27 Apr 2021 03:17:52 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235505AbhD0KSd (ORCPT ); Tue, 27 Apr 2021 06:18:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:35522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235577AbhD0KOr (ORCPT ); Tue, 27 Apr 2021 06:14:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0FC1F61883; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7O-7G; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=hgVIRXIaDP3qryP6Ow1GN4bGxSo94x3BXa49gnOI5oU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cLqoAGCfIL2OxVF4O1wFYsX4vv+YDrtXpUlPSG89NjnuWXuWVfchPC9BvNe1g4nW0 d2WMATiDQbGC51S+BV1vqBiBKSkssy/SwRZge9UDOl7Lh9m3dn/8zZycicXvMCSh1K baePTv9eIiGJE5e16PRSv+b7SYKcQFJ7RFj7q6Zs8kc5Ze42Steiztc6kXJS7ujIbS USJYcXCqXjNCZBXuDDwTvz88yjMYUMJuRQ4KQYnA/Mx7U4NH4342I802FtBupvP3WQ 6rx9zSlKmgc7UEhA7nDLPoiG31ZgNqu7nMGFhbwGH7F+EX2QaPlhuAGpX7OnU/2R7P MVqMUU9c42uVw== 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 v2 58/79] media: i2c: video-i2c: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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:08 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=1619518674; cv=none; d=zohomail.com; s=zohoarc; b=hh0whhfvmQ5wfgHQ63KqJWvm3AfqWU9gddQCzzzhtK0Jtx96A0DjHKwPsSc9PR32QSoxVv8CY2bGtLog4dFvgDKMHggiENOfMsqxViiyto7nujT5oKyrycNVzBr+nNKYZWdZ33Z7C/vyOuB65gN9/kqGP8zaTRulZ3Q+9CFdv5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518674; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ySrC2wlDMi90CsTzUZ9Z9K+attwrMxignhDqr647Jbg=; b=MgJApReLi5+YgYiHvJT2gnOVVwZ6nAuks/BJncRu1646514aDUZ/p+9QhDKr+wh2kfSnJxfYMCT6lqMKsQdTs48FNruEHKlaEDCiyYTaOvwzNLnVtoiT8oFm2zLVL3OquqS0kKWd8C4TVPBYmNkk8d1oZX1eo768tQzmsYpHwwU= 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 1619518674331420.69101830724685; Tue, 27 Apr 2021 03:17:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237974AbhD0KSg (ORCPT ); Tue, 27 Apr 2021 06:18:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:34882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235433AbhD0KOr (ORCPT ); Tue, 27 Apr 2021 06:14:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 204026191D; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7R-9N; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=AWaRUuBTKGjvblFCBeNGn4e+vA3INJOtepNAWbdP4RE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pIL8J7ESwDAxEOHib1rV5UFJGRJqdLRj1K+N2Lohfb4bRQGvZz3bvmc1IlpEQehLp mOXU4rc4bvesf6NJJ0m+8rWfDSE9qfz9zXEXWPZ9ZsFQxHQrwXvuo1k8sKVH3/t1XH oE3IjdKCtYke8Taz8qFIm271jPq+6XmUfKSf3ngDF7UsvMszRWSBVXUqcubAB0e/Wr BKgp0u1LaMNFwjZwDyB4qUKZftnlEHluPyoAoPkFL1qSPxRYjgg171mIoe5BidWq4v sbgj+L8oKpbrK/T3G7seE69Zt9PUr42v/kwtcnAjq+IqJQwa8EQtx6zeih8iYuMUVT Lf1pWMl7ybyuw== 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 v2 59/79] media: sti/hva: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:26 +0200 Message-Id: <612ae30867078d2d42e23fdd2b551c37246080ab.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. 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:08 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=1619518677; cv=none; d=zohomail.com; s=zohoarc; b=gdqPX3Xh7WcwTubu3g9+tcvIfQPD3K+wOdZlQGyB5r9+QZb79zHxE3obWBVz+RG+eebBIdfLByJLBX2WYcZ/Yy4EparX4N2v5OUqNfwJEy3ZjKC18apVAMCKBoyNblwaZFNJow24U0OKh25L2JcvcSkuR6wmSgxC/wNXLnjvVgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518677; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xBlzsmljHnZdUOJwld2xAtN8nqg8/ojsuyONQQwmun8=; b=iuWZo+5P51Y18wrxL4+cba8fyNHk9odDg7XH33W9QGjKJQkSD4VzwTughO1lkCs3JvVuHuZFDooPpnh+nd206qbYX1S4aq7Eu5pO6ErU5UG4aYB/3b1JEumnw5jQqBkQxGv7VOOVT3rcuXUKirbZ4dGHsgHvTRFBEO8b7yD26Go= 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 1619518677591285.6485091607684; Tue, 27 Apr 2021 03:17:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237634AbhD0KSi (ORCPT ); Tue, 27 Apr 2021 06:18:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:34910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235582AbhD0KOr (ORCPT ); Tue, 27 Apr 2021 06:14:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 205886191E; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7U-Bj; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=WMp2TYCwNpx5gqoBY3FxSLCFIcbo/CZW59R5D62z+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lf0kshXPK/rxqeTBI355c54YmL5dHtYmnPWjeN34v1sBREFxEAlBS1lNBlb2PTjq6 di2EqkvfryMOgFlSKNQfzSWGSkQA5FkD4TnFZToTpWQCQOYALVk/PRkQZ8poivnKNj qoSP9BAt9wZpojA4ExnskRHcRjy/YaaGmfffGAMPoXEyZhKJthkPPA8dFXO55IHAVn EAfSraa5n4DVu6KaxADyMkldS0dWdNalNSe5jlWJbeNvthXLN+V5dfzn7MviVmeCnq 51xPZdBmtA58Ob0j4YE6jqAdMsTGijzJOWp9vP8c4RM3lJKGnXNwWPjBQD8FKWLNfX apErN54b7iO4w== 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 v2 60/79] media: ipu3: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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:08 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=1619518677; cv=none; d=zohomail.com; s=zohoarc; b=W8eYNXxRYJR9cbH5xXS6Y/8axVkA8gwytRjnRyCx2FeBRmmSIJhyVAlgI2YNnOnPJfDVzSmZI2VIDLjQXK/35Q3lsHKNdLU28Xqfen01GpP5kb6gcZossYcpa/hNh89nRBgQg+4w5lHNXSuokVBMrJNPAoCmTFh/HUWG8hNyy+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518677; 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=Two5Yg7uH2pv+5Y8pZIu6/MTVGsg15OIoc8+2jkjB0ZbGplAL7MPL2abh0nVZCG4cAf+SVVDTEM9Cw5hFmWKRTgI5XzX9dOA6nxbW0yt5eqwaX7aEhztNHd/ZdzTsjlub3R2Y3WXOh178aILBfhiP8Zze84HIlTYeUdLZBh/BMA= 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 1619518677890441.5498507802099; Tue, 27 Apr 2021 03:17:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235661AbhD0KSj (ORCPT ); Tue, 27 Apr 2021 06:18:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:34658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235591AbhD0KOs (ORCPT ); Tue, 27 Apr 2021 06:14:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3311061922; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7X-DE; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=xptLiLCkGNJuz7QvbfWAgofgWCEJyWuHFXhmxlDN2vI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V8SvGjsspDfm0f4oLRWagweTDHcBq+I65mtRH9GDCgOGhJNQh/w4S8YPgVYBN+oHg LpAJyNKJERXzYKRpABbvHip/BdXCo2S2WMIb6TaSDtf+aM+LrkPp676vvGDXjMy3oz MnPID0Mb3Wqg8DlMztHz+eToj9nPREI+M50JzaKiTa1cxLXYC6fNtc3/u5QfleQdbg NTIzlgZXNnQwV3k4TsOd/f8mmLhZGrsvDx3K7FHIrRgaye6BpgCctMuurG5FPGBtBE YOfa5tXRGpdNJslzFodyWCIGD7iy+Hh6Buz3ZOaJruYCbVvZ4smkAJOaAvhiyhStIR qFJhm+b0it46A== 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 v2 61/79] media: coda: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:28 +0200 Message-Id: <2016c20ba94df57736e677fc7acf5cb109ac75a5.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518681; cv=none; d=zohomail.com; s=zohoarc; b=JTO6aKf+U+XwJyO+JVLBcACdy8U8T4Bm5M4G5eHukAcNlsHtrAVXNkRs3ETD0sLxFBTUEE5l5SBM/vTKAZH7Yywcv8sUvcPMoXuw5BtdsQEscp8QHrSl+Por81kdhgQtVyJpaOMQcgLXzXBja7iNWOvpynRUxKli5klT55Wd8kc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518681; 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=SQW+ZORMFJhuiqXybjyH6+M92T7DR/LgVzUV3b0glTMBoX+IAKXVOdrYkG7vrk5NAx2v2HQd5GGvxXaRWBtIEF7FWif+GGiKp42vCe79zFGi33tsV33ZcTSaEBNkqmc0WiLEnsPCxDXpeClZkZ7wSKvln80Utj3hihTkYnfs57U= 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 1619518681899538.051639261116; Tue, 27 Apr 2021 03:18:01 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237995AbhD0KSm (ORCPT ); Tue, 27 Apr 2021 06:18:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235133AbhD0KOt (ORCPT ); Tue, 27 Apr 2021 06:14:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 417B461924; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7a-Er; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=vqCg/VqSgTT9WFZipquUww7WREOlNkMrO5HLAuTAHyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ec7jCkiktrAFOKDsD6WO49JQ3NMdF7rHf47jiJUxfWvFeHIY6wItvaM/CO1CxLXZc mVWEHSU+eHS9oijLrtopjzkdh464OSazv5dTfMEkeZJubqSW3wSnJmFVeZiKVNL9I+ h/Ko+6LjgDI91bqPhDI4yoo/Pa6EK2ZdamzEfzY4nOvBLjQcx2glTqlao9Xhc4ZRY+ 1/gm0fxVX6JVcImQusYic5epwppK+LmENx0fvwExM2SylXEdTznFCiEUM1b+rv+vO9 sdSYI/uoa22o7VkTQHVZXcZLov9KpaEjE5JHMgvx8ZhoBP8YLn/xe7CVN1tSH5FTME zgt6IzZ2hnU/w== 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 v2 62/79] media: exynos4-is: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:29 +0200 Message-Id: <549d4b739a70d1b273590693a14cf9c0efefa8c1.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518686; cv=none; d=zohomail.com; s=zohoarc; b=n7R02F1c9Smd3pkXThgua8kOPazBXl/Ptb8Sa8J5ZJXGpj5XPlgWwOI+nY4D14aW7HhFdy/WneXyV7b10DQI0E3VU5/b+VMiPHPwImleZ6lfO9hIcEV0bcYi5RxvSfRlp5nHhBkFZpMf8Gwfk2EvLV2JDzQxEptALedbYySv+D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518686; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=92yCGI6NlidjS1v2MbWSqaev+dYY6vtMqPULSzyb5N8=; b=cIzTgJpyanmIQDDr3Dx0Kzpmuo6QijerETW3CZzv+22LahykQC2g/gSmJS3gFO6byxjysJ2QPMzPrM0ThCgsz4B1GZV2KMqttzOQTspN9i03ZGUAnxJDgBNgAz7GSWFDVW1gGI9RMT31QKW1oJwv5kuiQiEQPcig5uEyCxhM8bk= 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 1619518686020840.2894440258972; Tue, 27 Apr 2021 03:18:06 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238009AbhD0KSr (ORCPT ); Tue, 27 Apr 2021 06:18:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:34668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235596AbhD0KOt (ORCPT ); Tue, 27 Apr 2021 06:14:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4995C61929; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7d-Gj; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=TKtKuWw4arj9gE1QW5A97zHnmgQIngfUHjaR8gvLIr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CXnGRQfdAOPG4LJPaz3UjdbjxgfUeP8HomujIYINFkYzY4GB4o8CWCVIW2GR3ELGc 5VGBnYyV04LVREAkDn5MotNmwlQp6dsIqISTpDhAd0dhDLLIGNBe2Gjae0SAUi4ROq mGKXux/PbUCtrheYJMPCFBkmymM9RYnDn7xFnsaP9dFf5uBgC8V34u5OROpWfcBFAd fGqm160n6TzCGEFuhYSOSkSzR9TUP4iZTOz7JlU8tNCOFCEkc0S2vMUYHbZbwtWV55 OcMo3vIL2HzqIFRk11Kbv5ZxQXw7dRpm98Taptk8whbD+RAHd8tH1iIy/UOaMML6X5 KN+ZVDA5jsD6g== 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 v2 63/79] media: exynos-gsc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:30 +0200 Message-Id: <6ba2ed04d791b8a1529977920bcc3930c2f3238e.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518694; cv=none; d=zohomail.com; s=zohoarc; b=ikIS0upkupldgE4eDGjjldSpJ0C3lnNoEvDdvsq5PBGzXm9zr0v881IPGiJoz8ltwPJlsGQzxxzAdF4LHjO/Ux0bA3jwzgADqbUGpKlPAssJAhgM4c3zCjrPswWCNUc3LwZi6dh0GhZNdqHcd3MygLi1Wp/4asblIhUVkwFOLUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518694; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6tWS5AWeHgEG14BxYeaqs+XN0hv2Iox9SZeAydDvL1Y=; b=K2M539P8QIRqer+K77ubUCjN2yS+8+3ZK6nJB1nbehjf1o76ztIxqhHsMlAki6a7a/yVDKrVd8UD3Jir/ql+nR/3eukAGtIOCbxtd0SJ+0+M+STQoXftDhu0gS5kLYi4L54QoJvxY2ZD3ekacXKo9f/+8EqRornygpelCIDW8+Q= 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 161951869467076.248993301454; Tue, 27 Apr 2021 03:18:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237754AbhD0KSz (ORCPT ); Tue, 27 Apr 2021 06:18:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235643AbhD0KOz (ORCPT ); Tue, 27 Apr 2021 06:14:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4F1D46192A; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7g-IL; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=tu2hhB6CHAZbCfvPd96Qq+9zsUaGe3IxV7AH+2XbuEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8v5HNvwglZGfeJ/zanLqWX6BYRnlg8cTv+FYXIptUe5TPaBW5KTXFhjtUpwp2lHq siVH7DddVKZmRoNQIcCgcnlCJA7++C6asnFY7HEcj8RWi9GEBl7/SHhftU2guuh5N5 V1BAqbgUMDNac7KloMdVCUFtsXd4BAxVoLtr8vWrcr/Y9Uck2NGNWl3xP+GrwLFDcu 51iNqNVef1aaIDFapLKKAQHg/Vk+UqMJF9IX3+3mE8MZ1GuCgICk23tZHMdUxGK3gd jOCidh4U/Nwgl/hhpjIb3HWsA0nLVp+Rs8akCEdQxoOpQCo37tZSsVsTp0PRYXHLHu HSiU+z/0wgP5g== 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 v2 64/79] media: mtk-jpeg: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:31 +0200 Message-Id: <6b9c896cd16a090b334dd657f8937cd436288ba1.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518708; cv=none; d=zohomail.com; s=zohoarc; b=mrts3RVAIVyLdlc2ITXziwTxS2Fk9AKNTVXmZT8gojI5g+vXCrTkcJnVc2aUl8Gc2PIv2eRHQrObSouvYRkTQ73QOESbExO1MBna5NZTHdlmXgPxcn3DqJjehNA/02ZDbNyr1YluF/1XqXAJpy9OcpoJ6juh/psacLVwYOS407A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518708; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uIuBJmF0HMMlsWHg0vzZdGoLC6Q8BIvrlc0MUDc9Jqg=; b=LnC6y0juCqFA2tqoCuBqFzobFqugZIY8zy8wbjMsYdwgM4WGiTo21QJe5/X3ElZ6xfbAUyx/iUXbsH+nkr2gX3SPW8dLKxPYve3Y4OMagfZaM0boCgOy4sAW/qOW2X+TMDp9hKaoOUwPdY0SACAbvYcoFAxm+7Kt+6+625h1xIg= 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 1619518708802724.978931860302; Tue, 27 Apr 2021 03:18:28 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238209AbhD0KTH (ORCPT ); Tue, 27 Apr 2021 06:19:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:35146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235304AbhD0KO4 (ORCPT ); Tue, 27 Apr 2021 06:14:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 740B961939; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7j-Jt; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=wdynVwwhyvqKibF+xyVsNRL7Ix8YvvILE1Sgr+qtqMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yx7JeW7Us/vSd3GcfvzRUP1cU2tN1eMSydibUhNJgPBt0t/oMRY0e89kW3d9nsXju ThNOwsflQ1D88kRZRpaRX1zVslb971E9ZlXrqGb3JdopEF79EzwTT6roOb+4lmgLQL QVXkg5iLTMLHEg96wlqgVufUteYPnbOZC0EyUSOM/29qH/piIzRHu0bIj0+48V5F0r SGsCUU02SDY3UBZmOJdOelLV4pGruAchklLbSzLDy7YXNt+bG5Hb/BKbfVnmefphvn 1AVOn+//p0A0T7n76wxO9qy4rUoqpMn+amwPGdhxLlaxiGGUpJ3n7plnMdUllLidpz 5eBCmNjyeXe0w== 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 v2 65/79] media: camss: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:32 +0200 Message-Id: <92a145ccf144236b7dd09d6b7660a5a5c587ea74.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518697; cv=none; d=zohomail.com; s=zohoarc; b=GlBo1oLBOxNhm9OFLq1uGIU4fCdc3TArhDIvUOiXuogbpetZxn1y55rfqEOw/zPq6/fgVKgj099II9gwYcr9sCqyhjYje2bIOyF9x0jHBpMF/nKpPWKQs0ItVN5/RZIHT1X6Ckb/kWRbuTkIaTucHh9+QMe98hQywldQCefcVJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518697; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nfqQspwP397smN5c/JIrKsY1V1TLshHOGkxk8fccreU=; b=A7THupPHV69TFhixo8FAtgjQ6VN+fgELr/q79iRFc2s06bR5ear9kk3xc/qPwYwJdoVoEpf/ZGUZV5ScNxX91YG70hQVtYxDhpWrk+G09zmMlS7rvyjnRj4xmCwk4zoTwttke+2OInP296TlBi6JSrx4KcpcrT8XfAaUEAjkioc= 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 1619518697956923.5634057413268; Tue, 27 Apr 2021 03:18:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235563AbhD0KS7 (ORCPT ); Tue, 27 Apr 2021 06:18:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:35166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235644AbhD0KO4 (ORCPT ); Tue, 27 Apr 2021 06:14:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7270461938; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7m-Le; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=yFrbiuMzKmSO2EB59CqfXqOC55Rsmsoj/bKyqfWPoH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M6FF5nC+bkkrAbystgc6xb3f1/hUtUmxxHMXYOfIJJVgBktpkIRnnedcMu4/kPpGE f88qodmBkmiDfCCTjFK+Bv42nGV3tbXucCfSS9aSnDjyJVY/r4gTlU0gzvxFPYK702 IKtIkGyJ9CFM8VYiJt6VXNhGdPbwm+SHCzloEO+SgyIuxPNxP5U6swIfO3jvtmbylt jnCiWQDoQ+ENNIp+PpWap4i126F549gc0Y6WA2zlPZ58Vnp/ci6Pu2diU6jp4m2bN4 U4FKkUMcUwvVTwrbXP3KpiWnlZ5iZZS/JwF77v1gaO4xt6+heMOm9hlfGt5JC0JwCJ aap35BmXi0Xlg== 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 v2 66/79] media: venus: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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 fe63b9ab5b20..52760f045e1c 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 ret; - } =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 ret; - } =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:08 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=1619518710; cv=none; d=zohomail.com; s=zohoarc; b=eLJSOe/rzYgTeEw86yWUKciq4nQCrtV2gHqH0bcV42xYQU3Ylqz3jDEteHJri8w873ocT9a+rUGMcrY0pVfHBV5UD08qBsbxZDpumZTU1DUTNrrzncoi/JTV6iSB3oZ/fObF/yf8CS56tT68DoevXfBAqfFhxlaPPJNNxKikoYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518710; 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=QOSC9+XnHH3Nrbw6Q4VV6/zGAjIy3M4447HCajA+xyqmL+8MDmI1fH0qyOht0c6ZV/Lz12sRHPpm6nDLPk00Zl62HU/WgkjB+c8md32lY5NZaVyA9w9mXyTabuPPpsiXVFKfu0W1RGYyc+8xQBTzdMi1z2vh3O3AGrYHPwOmQqY= 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 1619518710119525.7168204207384; Tue, 27 Apr 2021 03:18:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238239AbhD0KTL (ORCPT ); Tue, 27 Apr 2021 06:19:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:35230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235648AbhD0KO5 (ORCPT ); Tue, 27 Apr 2021 06:14:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 783856193E; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7p-NZ; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=73B6Lks3AupUDrJCPSyBZhCBhq2sPf760XjzihM5LGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LNaehuD9JL4nqBubNhvLrPbf5J1CSN6dWfCnz1EQzrzNAA0Tx0IROSrYfl+slfsop enTk1twl3CduQlgCpYUvrdPfnca3pFdlOo50REg5O0ONgKDIuWnUYOVKQPmD7IvrFc ksGL/TgoNbcEgChXyXxi7i0inXCEomz5wTogxgj279hB1ZOH/YT9Hdj7qR0d7E1Wg+ 9FVUW5pgTww6tpbf/qCZr0DpgT+Ry5TFchNwpDOvNuWBZ1azjnHKFj9acOPfiL1GUo w42tWSfQYsz+ccnpqH2N0x3bUXXMMlBOXQ90ire7MiqkKT73+CUj8HAJLgEQaIvjgE z4jYExZg8rsew== 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 v2 67/79] media: venus: vdec: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:34 +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:08 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=1619518712; cv=none; d=zohomail.com; s=zohoarc; b=Eg4ZlhQse+ZnMwyTlCHki6kGHBEUiegJDA87wo25WX45bBv6a5efJahE2Cv5Af3hqkAZDlsAGvwUXgekQYFAf8aKyqpe62qp22u0B63t6bldQgHOJzFQHwVf0HTcWHe2VSzosvp7ukqry82py+IjHVziEhQudHIHv1SwCR+8sog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518712; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qFTRVUszSqQZiO25RZUrlPtLj0Cai3UhhBIBPa+fAFk=; b=Ow3jNT+v5x7Jx8A34Ipu2DqmjMUUDmOInSDN+nX33WDkAcnkmBsHm6QUg8CkkeYl5Dy4fwSaaWrGkQOfbF62N7hF51J0ih/+AP1hoFcdb5oJNs91DHrlBZRfxxV5qISe6FjbgLpf6Jo6TVrz2LYBmWw9Albgj22LSVYrrRuXQqg= 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 1619518712308353.04704727565183; Tue, 27 Apr 2021 03:18:32 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235686AbhD0KTN (ORCPT ); Tue, 27 Apr 2021 06:19:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:35286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235736AbhD0KPJ (ORCPT ); Tue, 27 Apr 2021 06:15:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8573E6193F; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7s-PH; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=phIvrsjCST0hqKSIzsjBL4/Aigr4NLUZL7GWQhPHYlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kY9FX0eWskXwCC/kR/Ap1vY+98s8XI8HjFqA/k/FDHUBDdTop4fLTcsdNT6VrhUuJ 1FvY7ml4DjoFaPJrBh8adOYs6H5qnfiGVD+EOuojYK9YK4mvpdRGYGCSag5AL6rHRy Yo9bWlbADUoPaJCABBw8niXskf5TFHjtFCiejAeg1+0l8FB+Y6KlfZu93CChppvOPS /CZa8jx8ils9bVcf1aMgfY7fd55/jN3ouh+SDC2K31SLzHwuxkZSCor9FZjHOLwLcz UO/bjTB5TKDaT+JjaXn9F/gefzfoomo8X06IGgcFHxYAo+y/1zoARmYPGAP+Og4kl2 Q3Lr1YNM+VB1g== 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 v2 68/79] media: venus: venc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:35 +0200 Message-Id: <01d35313f06f861db77da2903382518dffe82cbc.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518717; cv=none; d=zohomail.com; s=zohoarc; b=dqWPKLRtU9Vqz1teI5w8GIFBzLrgZw2p4ac2iJOYq34xokkSlJkFvT44TfT/1M7DABA5oRfWT7qi4W8gdX+M8zz0qRXgpXzENKYzWsFMX9j0a03VpHtBvnlQSVWYWt1U33XOZWjpmdWGdo5+m2AVOIFNE1KAMACc08PQsfQbkQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518717; 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=IauSwOYt0Vujdsp+iaDct4zl3iw2jvyOSMaSlPqzgeem923YWFjizRiI1bl+kreNokS3TB5lNhaiyAdybFTuGpUxXZDsfYLXPN7OsgKFqExEKrlv6mYHzpBJcLQ8janT10BxZDZ56t7A40eoP232Bs8fkoP7xrsXZG+hmVBH8OE= 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 1619518716999530.4174807065042; Tue, 27 Apr 2021 03:18:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235719AbhD0KTS (ORCPT ); Tue, 27 Apr 2021 06:19:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:34660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235745AbhD0KPJ (ORCPT ); Tue, 27 Apr 2021 06:15:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9E67F61948; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7v-R6; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=4l0wYnfzYi1h956EsgOdlzJmS/W0qfvo5eSm9fSkn9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dTj5/2g+IuretA4WWeKDmoFHFHBjS15TGHAABgAT6vT1tjWvN2eyDuu49l3Gwt2da TOXSj3AYurMZUu47PRrPLR35UWjYK1oTF2OQDM0SVSYM+x/rcSfkQUw/n+2AfIlvJU sCDCyJRycpNzbyQygvFVMBA1eNdadXIBsGULVeG/GTQzugoKvlBwSoKD+dE4938M9e qu9YoMveKc1YY7XA2veI4VIhBc7zsPnRTgp6zqZshJN77GRIa3/Tn4TlwACTv9yljW bZGUqzbVtPGxv4fSb7BDDauM28XU+hupk7UJ6AmARKC7KIgEvXMxMmo6sLbaYu3QeI NhNi5KFGegjVA== 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 v2 69/79] media: rcar-fcp: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:36 +0200 Message-Id: <64bb917e946815f1c77bf2bb36614ff950a98631.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518724; cv=none; d=zohomail.com; s=zohoarc; b=ksLrtC96mMigv4BuGMJCxoV9PMEtWh0RYKgSsJsarZKHc5irSGGXYkphotOoxciHe8OgBIo+SuXuInEbK+aOtOzPyz9GbRIm+sMQ69+NiLGKKwSmyevZnaSeuge3vCEuOPiC53WTiXmjz36PlueYjBakEQFLGCSHF2HhkSEBtvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518724; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wNlWAJheWo8r305lpFRr+Xmq5CAdeEepltQZlmQJw8g=; b=hyzty5QqNr8hTJhisSNvoYrf5rXeYaAZW9NE7iSdnWsPgKH/ahoCWzAHf8kBxquOl4bBEjrO6jbOzH1byQebLSLCBuoYCdn3KhHpStOv6xRpMgQ7ww3v3tV6oyedqawAPnnT+RCVin7NlD4THrfDvNx1hA1yNDRl37fUtZeFWfc= 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 1619518724127337.14492948781367; Tue, 27 Apr 2021 03:18:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237909AbhD0KTZ (ORCPT ); Tue, 27 Apr 2021 06:19:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:34864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235314AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A85186194C; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j7y-Sx; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=rChg/pXG2Qjbehywcb/+z5hE6+LFH66GvNnoCtLFEBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSkxcPymxCcHvHCHnPGNTKlIe7N/iWkE12x5+iF06VhEniD4QeFLHL9o7KnQB+6gf z4w6rnmCHtOLpZfpsniFLxW1j67cKbiF5B3xZQMPX5VM+R6ZNBmTJnvUqrk+yUC9KL 25AEapb+FpzGnfeGIkYNUyaLx/9e0zpGHp6v2p2bMvObUY8EyraseE1M4pdSdy7Bxk drk2/1vsmSUype/gw8qJUaMh17jCJiAZmGkIge8RsuRJs+WJy4bkTwPUIlUOWMEMLf Nyxv9LZ/Zaq1kI+6vFlRV9c7q7XiWJWFVt3MBptI/LPv1d3x9yScwa3SsWg2HzjRab T5IhMmxNp2Uag== 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 v2 70/79] media: rkisp1: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13: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/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:08 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=1619518805; cv=none; d=zohomail.com; s=zohoarc; b=e9LXyXsjbrwe8PVRpt6aLmmkA3n3CizXmBZGh6vdEbjkg0CJo2U8/2H8xAt1l8+vDGnBcUD6QCwf1tckEsw476J6yJXdkyANqY6AMbG8Zqbe/CPQY3WaLnb/e2pDqKvN0/dUqf57yDNGoA4bJAM42Vw6EjydeXpOch/z1S731mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518805; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=63AtnkpOqrycgwhgC9BpeUaU3jzUP88EBymuwKnRx08=; b=LF8EqYWoOlgP+yzg0wFaFJBNXP2g5/Xq9FgMBCV8leN+Aqon2jOa8QrDBw+izy4rPyVo6Z41kTmFiLKRPOpx8H3DziPIb1LRpdfYY4oe9+p6eq0DgYrRq1aT7gNpPOegbmA2LNy8RZ88VhzrDiHR7g5ZzllM9DBgWvlJbwhSQ3A= 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 1619518805081211.03138566584664; Tue, 27 Apr 2021 03:20:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237912AbhD0KTh (ORCPT ); Tue, 27 Apr 2021 06:19:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:35420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235766AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BCE7E61951; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j81-UR; Tue, 27 Apr 2021 12:13:51 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=ORhYQV8MaIIM9QGoq0fv1DmSrG26N8/lfMtTN/XnDlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ggOlyf1YNtPBHjycx93XL7+9/FJpqcXn1RjwwVtuYy1ppTBb8ut9ATtgAjEu8VsMg dWrKgO7UTs2MCJW1N6VISg4AC7FY/0wiaaiazic1WRTgT80Z/NS8jYHOO0qS2R31+J hMOrgznyM+GpxW3q1+L5g7lEKn14q7QYELvGFeUy8HBkH4HuK7XV8+5TcHl1uA+z+9 hQI2tiIwFeUBNt1vKOwUZBhM6BRIlZcOp3khK6HiPYabOMGMay6v113afJvBRGMOX7 6iOvJKql8hN36/6AgC6NaA3+A2zKAW2C+ArY7/nJQlgsMmJe+zEzHkaQ0V02zK2NSB qSnTGug2neRfA== 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 v2 71/79] media: s3c-camif: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:38 +0200 Message-Id: <77cb3497163bedc3a75555b4cca4cb980c7756b2.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518734; cv=none; d=zohomail.com; s=zohoarc; b=mD0kpHxN8EfeNJGcn4idhzHf5muOQjlVbXYDIcKQUlZzS81/pn5Mui60zxGI55oE/ItTWJfg2ZMDNk6lPB1rGa0kjWCJdQIH2WoReCWcC8lCSHTH4krFaQ0HTn5NsfuVvcFdbh61ShOYuh+/GUTFCVhQ5tSZtKEJk7R9HrVah4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518734; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UuREguUnWtJMEbW22CUBV5mbM3OEKqZjCmRLeRWME90=; b=L4Se7h6hVTWpCcRw+7iES7zWTYsvAtCUF+vinXFvoL58Sgo3mHYtML5PYki+qpOFheKkNLqftAgem3b9RG0HsSu57okr2Xo3SjRXlLbhIh/ahKTKOi7IX5F5bX3C6cwVHlgsUNPav8g4XfS/jrrOfavdx2tN8bO8CRBxHiM0tsA= 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 1619518734247732.8098410521212; Tue, 27 Apr 2021 03:18:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235440AbhD0KTf (ORCPT ); Tue, 27 Apr 2021 06:19:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:34866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235756AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B99CA61950; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj1-000j84-W0; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=GlCvanyZeZRx9KVkDMbg84X3Nl/epjQxFII8vak4mR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P7VHtJ1uz+zwh3J3M1NM5EyiiQiU7ulWuh6jsYSo4+uOq3SQPWkq6fTPen1pJxPic XZge+aium9DyPjVn3aej1TacFAGCKB/FO9CcYC07k++TYdVTQh7KU6eQQ4d+PhW93B 5gMrFDssm24BeJuEEqie/LZvrpP7n6EXOeLMYhA8Fx9fsL3BdtbjA2IIIFpQwTgbgh oKvL7XFQagk8hlDPOtpjI9DKVFvWT8oo/TTcrRJb+PF3xxhCEGiARki4QhTm6ZH3b3 5cMKb/weT7SG3Z6pUFWZdavFIDTTmn8GD5u3QsTVfWHV2bjnpwCt/5vhKstSwtWr1e 4Jx9w0iYp2OZQ== 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 v2 72/79] media: s5p-mfc: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:39 +0200 Message-Id: <1b06b8e70c547f8bba0c154488f9f8a8013a0ea4.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518737; cv=none; d=zohomail.com; s=zohoarc; b=kJyTX4/Qi9oPDPdKAdQ78QXNUFM12DII+c+Kv6BeijtgJr27o/+2c8VcuMw5jz3sMYoBaaahQ05TjUQJlo6kVR7BwZJYBQevUbEm+b1J9X7joiDyhi8ZaLAy3P+f1NEhGM/SrIouXS1cMCF4oioZgwBdQRKgzy3Y5GzqrbMq8Ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518737; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sgE3dj4dMaYUyhw2sD63gAOAxEhr9JpTC4MUmn50jX8=; b=B2Tx6kSUCiOetguyd9zGbz/o4qyuNcElzyrIDCvCTmPwM2mRgkGOJ5cz18RIPQpvi2JKSn9G99sPiySZM+ySKI7i5ului6tfNRLzfa5jKqL3vJwZVnootk6FzLX+cTkOa4WcjpbjImNSCPmtr4YJJesIAaK/wRY6mNo6puv5Sac= 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 1619518737600466.94757041332934; Tue, 27 Apr 2021 03:18:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238040AbhD0KTj (ORCPT ); Tue, 27 Apr 2021 06:19:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:35422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235543AbhD0KPK (ORCPT ); Tue, 27 Apr 2021 06:15:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D8A3F6195B; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j87-1H; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=bbBhKTio+K3X9fPKV58F4G07rHzCE6SQVXwv0W77lPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rLTfLIbrLBJ2cw0yC6O5y1QiYTLCWZRFzgjVDZ0X6Gc+TVikcfzOmRs3otKqPy8qG FhfF3ATiNUHAIFMEFzYNruiTBKOtnZUZRDhsKozdaIxp4xGYq0s6BqJoldn5JJq9WO ku4Edmpo+xTYboLWvBrU/BU4hV6dhMhu7dm3AXRPu4ETFW9MGs8SUX78Y2IYpNlziR EOhSmH2nnhh88Mx9lzrj8OA0Hf3VoR/ssWdBA1EbspQPqMHOPl8zVe8bGQp9DisOyI SGl7KKtTUht6GLvGCyTW0/AV9zT/yEkMXaRUkzE+Gww8p7y/+To61dMr3Q7Mxx2bek CvZISc/Tm5SgQ== 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 v2 73/79] media: bdisp-v4l2: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:40 +0200 Message-Id: <5c243195eab766e74b783e9da91224d360869635.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518745; cv=none; d=zohomail.com; s=zohoarc; b=L1xatkKdXuwHdmX1pIXiIQJNJ7P4MdKo9hKlMteJopZkwBtLp4KDzJfVFHAkgHeRmSPxO7DIX33MBx8mPp+rMeDkcatCDogFDFQv1fYpsC9KTtlMuwVWGdIDXi9ZGavbCKWeLf+2HEA1p6zg4uPsFQmI9KsC9plvjFhbP9RymUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518745; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VMvfSgnn6oSyhENzNZN7g3TxreG2d2E/GvlVbPp4Nxs=; b=R6vwKDxMGA+IK3Ofban7lkyU3vdSgBb+4k5IQEB+rk1xlT5p5geVh9IGODCkyevy0moP/s+MZlsotMloBoEojWe07fUwWGduEQ31fDyASNXnrsah/Rhq1FdNgHKKprp4pWkxCzS2jIkTzU9n3YvVRhvP+bjA6rwxJmLw60ATcJo= 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 1619518745553582.7558097531322; Tue, 27 Apr 2021 03:19:05 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235412AbhD0KTq (ORCPT ); Tue, 27 Apr 2021 06:19:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235790AbhD0KPL (ORCPT ); Tue, 27 Apr 2021 06:15:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DCE406195E; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8A-3K; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518433; bh=/R60wucnhMxzatTcaaq6aX+wA4KyHRrla+Ogrsx7GxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AZ9IAMfTbC6VCIWCPQlVZ4eZKImP4UuqT9UAattBwUeM/l8qVA4Noq1J7332fl49c ug7YMVGmUJ0d1CgHbsv8SOYob4GcnKR1mdjUe128o5oRbp/PHT9sjwKcANpAzOt9GC 8TUDuldsBLF9F+f6rkbpa8VVrYGzLE9DM0AFV6pUGs/cV+trIcFZD1Q9tINtrZ29Ai RU4FmZTlQdW+xhZ7w6ktbcDzef+/f7qc3xjYo31aaPkzZc4UdCCpmGPVTlnbGdjlBk h0FBsIog30AT+u8t68xZs81J5kjlh94OMVu05Zc/tofpbeqZIjOiW5Rfw0XSpSrd3C TtUvtp88E1l9w== 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 v2 74/79] media: stm32: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:41 +0200 Message-Id: <138647d154e523f6e0ff04af1dd94e8bd0facff3.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518755; cv=none; d=zohomail.com; s=zohoarc; b=NNEIoMsB9fedvS/P5AFCrUP/TSqRq0Z8c4YZquQPbQdtN4Iaa/bdYUkcQZjJOqzbn04d9uusfg/iGOiRZKKnWPbMT8KkOQ24A6HgQJKfTo9SDNiw8g2S5d0HwqC2bnJMnt4+vM2095xctZLt1aMZLts0Cl+R70cri76Y4WrBr2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518755; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ibdjOd74zn5QWbuSye9o2gRXEdlT/fUXvhYWQjU18O8=; b=AwnJrq13tY9cvPgPQv/dqcRSsK9IbRe+FgOeVtGhViSveRd6Ph4lEp8xtGr7+1oua9ajJmcHrdXNPdROLM63VNrm3VOaHHgYJR3bT+W6MTvrrd3sIzAbW1Wvj4CcAVN9lyHBUvxC6+msTj6owi+ggv94pZozlWnHHmUhTgZw7XY= 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 16195187552981015.8126503883612; Tue, 27 Apr 2021 03:19:15 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237906AbhD0KTz (ORCPT ); Tue, 27 Apr 2021 06:19:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:35522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235858AbhD0KPN (ORCPT ); Tue, 27 Apr 2021 06:15:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EF8AD613DB; Tue, 27 Apr 2021 10:13:53 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8D-5T; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518434; bh=Q1WsziPcbnwAb2cpqQFZbO8zttZnZQq1oIpn6yJZI+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOxoBc6fX8LQ3nxyOd0t2RIx/rdGgjYfc5pU2Uogwl6kdtZa9v7rIkXdJ8X2UMoUR 9xe3yaHftnVjn2wEnD7orANu+Te1STBrC6bv+8Cri6rd2+yG0ELK1JCNedgn8KmRl/ F6UNsw4VGQWvXFr75BgLHPB8fxn5YaGoLwOE1Ta0gsE6V9AqQoK0M9AUkI/u0DHXI5 2LS85OiasiI5qkpnIKKnPiEpWc0LR/AiQCSw9kdGTI1Ss5uPanq6LQx+G58VlLgL1U PNq8KwYSg7mrpWYTzWyazSwmh+bfQIV2VqDmKo1wXajK+FzJ1eH0fFxJnjhyaInjhj dPoD7fly50gVQ== 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 v2 75/79] media: sunxi: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:42 +0200 Message-Id: <8c9d978dfc49ea2de6a1b6cf5b3a9d647e6b1cbf.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518759; cv=none; d=zohomail.com; s=zohoarc; b=HM/70B6zh+JSpVpyzZiLJzsenzT09MP2EQ+2SLzTk++138gOjf6AEHf3x/Mcrj4M+3zeWDEotoBTeSXw9GD6gck7EcMFgscFSfq3A9o41EcU0x8DvEGlAXL7FdpDo8RFf9ha3GZxhrQvhK3C53JIVnRf00LFQp62nYWyZIFZDz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518759; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=12KRzueB6SAQP7as6alJYowk/8pupz0I32OophPzn48=; b=eKOJS5m31oFHrNiMza+CC1KFHGDY66pPZSh+vXFk9hoNTirw1afHKbEma2mGtSA+fx+d2BY1FqgejQjJajboriGE5GCNBtE+dLAEvEz27plxbromozs78sKV5TRQyr+oKkC5ROdvAChVhROHHEYfjGqTGGCfMxQ9A+nD10xxveg= 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 1619518759418285.12988944153847; Tue, 27 Apr 2021 03:19:19 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238070AbhD0KUA (ORCPT ); Tue, 27 Apr 2021 06:20:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:34882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235902AbhD0KPN (ORCPT ); Tue, 27 Apr 2021 06:15:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F7DB613D0; Tue, 27 Apr 2021 10:13:54 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8G-7K; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518434; bh=DzFwWWrx/K8GcHK3QK7SiLSCre5vWmnzlplRbKVIaVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q8TJHIsbaNWApzLqgfcugc0VY3GqjYdzUZ4USSsroHuzRu8QIiZR2qbWwi2bla1dM 7aZKjfDEBqVGrwlIg9WXPkKBxuU5a0ytzhq50QZr/7ztuXN+GTgJiaGZJrzLHMOTw1 bynBEbJKAPhQ4qt0Wd1UBeglqlZgaGLXjGbgIlKhnRUNol/zEUy5pHUjdh2OVmwAaL 2hTxjqym27NlHZsLLcHc9acUkcpFQ4sAZqdpxswbsgsvLfW2K9xUkBOPjoOSKBkfBp PHSx0JAD1qkKc+zQfwug04LfdI1tRRy+iEP1C07LfEigoVOwx+fBX/MFcQgn6MAuKk Og2ntl/CXDtzg== 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 v2 76/79] media: ti-vpe: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:43 +0200 Message-Id: <20ed950fd07ce95883a1ab00095c70810c7b800d.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. 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:08 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=1619518761; cv=none; d=zohomail.com; s=zohoarc; b=Dz4iAX1UgMmujzdSvTW8W+ffggPW1cEnvzkCRS5RSCfNdreUpOpbYukZZF3xQicCmqQTl/HC434AEH57RhBI0LK0fM4p+B6+DS5tXxx+scRULLfTYrMeWdvip+A1zLl7cRYff4haZ3VdX626Gx/mkT6OBWYL1fsn5boFYz6qWNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518761; 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=ItnzAW4tKcXOYTGJeVdeZolYmia6asls1hpkpwPg4B6v0CuPVkHiO8mMwQaU2ifAqeJRyP7/6/k2nmC8nuqLdiT7MRDhR1452hUVi/DrIciWnn2jRVUasOMFeTz5CEssyxO1MtUbebvEm8j+scnvQyxbinXJoJWOBhTIn6hMxng= 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 1619518761827792.3316588526756; Tue, 27 Apr 2021 03:19:21 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235576AbhD0KUD (ORCPT ); Tue, 27 Apr 2021 06:20:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:34910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235942AbhD0KPO (ORCPT ); Tue, 27 Apr 2021 06:15:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1700B61968; Tue, 27 Apr 2021 10:13:54 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8J-9i; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518434; bh=HzlriyHzqlZAHsYOJEVourXS9CSW2DolwRX6O+Dbyqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J5cpkI1Qlep4gAdUE4qBI4ZNx6+hd1seEK/CICW3B85BWgCm2lMSWzseaXUPQe/uX 5RYajuL18Bpdj1iUMcupp0yxEK4NyK2WTRCAhqalYBtgCP+chu/RmMlaC1ek6zFZ5i 1ytXSg/mrycAk2IjTDYxZHHxbqNP3oqRG4WOLmw5mOIhQ+fHxeNdguB06OEA467LJG HKJXBf18OAdGMv8wSYZEXdB/1GoA6kdBaxSiwkQ6Ks7LgTQQtbp3lJQMDAUdGpddAa W9GT6tyWCHRRUe6D3rPXXAhBRKG+YNlE24bAqE5RVdJMXUWuRa/wt5lXE6ZexoqjP7 KHtMtI3aI8Ntg== 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 v2 77/79] media: vsp1: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:44 +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:08 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=1619518777; cv=none; d=zohomail.com; s=zohoarc; b=AmBdN/5t8AhGOwaCCbuZp+1AlGlCmZ2KulkD/E7txYYT/5a+JRGYbumY81LXkmMD8kPsVNPdAsARAiyg5E6FDhebhTFmN46FTr6f4yqb6BRMflpWKIRZzCd2lA/Sfl9qXX8Z8y4Qrk7t9eYwTxygox2qW8l3JY+Vrsp+xmIbLjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518777; 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=IX6qfyoLu2CzbUm4smJJfmFOQ0NXx/Lpen9CGmAIyjkwTFos1E8u9pA4NEzhNqc02Me1V2D73MUS+50QtDOxPEAxElf3GPSNlURCeLBz9oEoKK12JmcKTeJQKrzwc3Xbo0BNDa8lYVt7e+LZNqJ1Oo3wYK7po8ezyBMWFcdysco= 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 1619518777755667.1405087301493; Tue, 27 Apr 2021 03:19:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237981AbhD0KUT (ORCPT ); Tue, 27 Apr 2021 06:20:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:34780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236134AbhD0KPO (ORCPT ); Tue, 27 Apr 2021 06:15:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5E020611ED; Tue, 27 Apr 2021 10:13:55 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8M-BJ; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518435; bh=ef7IZ30lWjyFTV9EZRM5TkDA3zgk8AfGs9/mdIqlXQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RB3Q5l/+RxAU8Jsd4tjtOWG3kz+K+KNeI0F0TYSc68vmC/Y9CU7c+TXrc6Js29jDr nRymjCPnKpJo4cDfNU7p4MMKKKZ7JewDJzQ/1XC/TB45YnTBJW6fQgdohfcitDLNIW Y+4h8BajogEp6yBzVlSt99afe7ZS3/CIR9zhRqJ6FK6t9B/0TAK227JqwSrZwqrj2I KC/DvyHDzx3OTOY7OnUsV3L7YTy5JNpMG4bmBdewOuUyMD9lEFFVe68kStsGuMDwDD K9APVYPUfpZGgv4vStvVCYZeXcWcloWaRAP+SLfTF3GL7YMCgrLsz/TGJ6PJ378ysJ c3HR51tTcDLVg== 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 v2 78/79] media: rcar-vin: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:13:45 +0200 Message-Id: <9ebf042135b50dedc6e1f654e4c8487602645d29.1619518193.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:08 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=1619518774; cv=none; d=zohomail.com; s=zohoarc; b=kP3nmEjasUhXXP+z9tboPP/xP3yoMEExlXaqo3pglJjygXeH3u4k6CUmibaK50qFuuommAtlcgly+o0rMwXHGfJGrtzr0aYiAg9rubKZqQ9sUVEzay64aEPtA0u0MFXYb8Rq1QoGbIHHXuh5oHUfkbltVn7e7LswsPiTdaH2nns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518774; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6aHqXZX0GvEv8M689VN0ZTC03Iuok2m3bZyU4jw0V6I=; b=CAMrQGXQMcdXFyWifwG676ytkOTyYCQvB7zK2W+DIVXj1lPfp8qfXnXgU39SVFlKRUomquw0WdwY/69OeW7SStRTjcLCM5Mo++52IvIYB0VdIzrfOywvcXM7kdhNEHFpXrPEwuUWvIhnYyLWfiKaxptmeafzG916Blaydze6Xzo= 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 1619518774438208.89437179801405; Tue, 27 Apr 2021 03:19:34 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237760AbhD0KUO (ORCPT ); Tue, 27 Apr 2021 06:20:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:34658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236047AbhD0KPO (ORCPT ); Tue, 27 Apr 2021 06:15:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 359A36196E; Tue, 27 Apr 2021 10:13:54 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKj2-000j8P-Cq; Tue, 27 Apr 2021 12:13:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518434; bh=9XhzsT7qorzb0O8m+AZfDrHyIqnxWFrm1sswMUzcdRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=homNswZsvi3mGrB+l98sroFS+C/F69CJQA+9KlUyxudW74Xi+ByY6ffj9t9pty0oW FYXGAGj4eQvOAlOjxHYdmWM7AfKSOtbfXnvOoKlORsojpR0Srlv/xGdiLrTZWhnQhq 21ZL05Qiwme2NsO12Oq5nal3qRX+lK7scfhjCNDDm8Micc1frReWiNqg4jR1xgxQy8 7/958He9RkPM/f9Njh/2KDGtyHv++RK5fa5eI2aZL1sBez0PzbgpA4tOhDsf/x9pPC lzut5TGIjsXxw9UAWXjvu7Vc8BRNzyE5omQiYa0pNduj9esu1e0x8IHZjYKwvlLj5z iV7WA6drJOYyQ== 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 v2 79/79] media: hantro: document the usage of pm_runtime_get_sync() Date: Tue, 27 Apr 2021 12:13:46 +0200 Message-Id: <29a5f9cf9680a36fc1f6277364aa7c53776ed0cc.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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