From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66DE5C433ED for ; Fri, 30 Apr 2021 17:00:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4773F6146D for ; Fri, 30 Apr 2021 17:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230350AbhD3RBe (ORCPT ); Fri, 30 Apr 2021 13:01:34 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2966 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbhD3RB3 (ORCPT ); Fri, 30 Apr 2021 13:01:29 -0400 Received: from fraeml707-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWz284Rqsz71fmN; Sat, 1 May 2021 00:52:48 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml707-chm.china.huawei.com (10.206.15.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 30 Apr 2021 19:00:39 +0200 Received: from localhost (10.52.125.96) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 30 Apr 2021 18:00:39 +0100 Date: Fri, 30 Apr 2021 17:59:04 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Greg Kroah-Hartman , Mauro Carvalho Chehab , Sakari Ailus , , , Subject: Re: [PATCH v4 21/79] staging: media: atomisp: use pm_runtime_resume_and_get() Message-ID: <20210430175904.0000508c@Huawei.com> In-Reply-To: <18b1c2debc56925d9caf2d67a794f761557a26f4.1619621413.git.mchehab+huawei@kernel.org> References: <18b1c2debc56925d9caf2d67a794f761557a26f4.1619621413.git.mchehab+huawei@kernel.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.125.96] X-ClientProxiedBy: lhreml721-chm.china.huawei.com (10.201.108.72) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 28 Apr 2021 16:51:42 +0200 Mauro Carvalho Chehab wrote: > Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > added pm_runtime_resume_and_get() in order to automatically handle > dev->power.usage_count decrement on errors. > > Use the new API, in order to cleanup the error check logic. I'd mention that the origin error handling order was wrong and you've also fixed that by moving hm_pool_unregister() later. > > 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/staging/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) > } > > /* runtime power management, turn on ISP */ > - ret = pm_runtime_get_sync(vdev->v4l2_dev->dev); > + ret = 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) > > 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; > }