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 BCE61C43460 for ; Fri, 30 Apr 2021 17:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A07B161458 for ; Fri, 30 Apr 2021 17:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231217AbhD3SAo (ORCPT ); Fri, 30 Apr 2021 14:00:44 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2978 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbhD3SAm (ORCPT ); Fri, 30 Apr 2021 14:00:42 -0400 Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FX0Ny6hwZz6wkr8; Sat, 1 May 2021 01:54:10 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml744-chm.china.huawei.com (10.206.15.225) 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:59:52 +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:59:51 +0100 Date: Fri, 30 Apr 2021 18:58:16 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Alexandre Torgue , Hugues Fruchet , "Mauro Carvalho Chehab" , Maxime Coquelin , , , , Subject: Re: [PATCH v4 73/79] media: stm32: use pm_runtime_resume_and_get() Message-ID: <20210430185816.00000ef5@Huawei.com> In-Reply-To: References: 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:52:34 +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. > > 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/platform/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 = 0; > int ret; > > - ret = pm_runtime_get_sync(dcmi->dev); > + ret = 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; maybe err_unlocked; to indicate the lock isn't held. This briefly confused me. > } > > ret = media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline); > @@ -848,6 +848,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) > > err_pm_put: > pm_runtime_put(dcmi->dev); > +err_unlock: > spin_lock_irq(&dcmi->irqlock); > /* > * Return all buffers to vb2 in QUEUED state. 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.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham 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 83513C433ED for ; Fri, 30 Apr 2021 18:01:52 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F400C610FB for ; Fri, 30 Apr 2021 18:01:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F400C610FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mBArNPs3/TgRgoEEz2w4SSdRkI3UPUeEO+jbG5rEAO0=; b=eXQ9dMXQrtNIvY92uYBzhM2zh und4/3uPUDVTjv0yDxi3N526OFPI1956r33K+4xlxNULQ3FusmExWQFN0e8EWsGJarPra2N/sKELH uloaJK+7AIBboYgxIpyRErcCNV78ODYFRR57ci8SVwrC6YzbHHcHVxyPAuvX1zlSi7rCCP/GijFYX HfnLBdfdObuRha//7pablr1SADPl/4yLrDyuKeOKogVdIUfkoEOoq272mTnmNf4tTEh0ie2odXiFo LkFrkElQNzCa0CWFhRVo6Bwd0vSPLXMH82cFakN47+EvtOhUzo59Sybh1Y5GhrUbpuysLa73n+o7K PZF2eM0xg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcXQn-008Ky5-TO; Fri, 30 Apr 2021 18:00:02 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcXQi-008KxF-Dc for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 17:59:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:CC:To: From:Date:Sender:Reply-To:Content-ID:Content-Description; bh=Nlc4dgD+HfIfld2n9bLSd0iuOyX4+MOPui2tAK6HCi4=; b=0YFIFP1oNzN3mCI727BKweBRfH HZAtdtl4YpPl58V+6OVOuVs/NxRoK1YI1eA/G8Qo+5E/qMPBdAvzsTtxqwbj5EITdVaaXjeivdt3Z 3iJFoxjDhOYQEWBZDsyf90FIyuRj6YoccigiEN9I/XpP0pR3Jb45FasNjrPsP0cdiqSipoU6IqOUz i+BTWW6HBFR1G3Ab5GzH+d5iFg963/S7uO5N3GAg+2s/uRZhgsjkk8JAs5kot9Gul47OCAx9/q6WL /RS/q6zs6M/cJmuh14WZH6oyGnPWA+LMR/39BJzPSthJkwZAkigtHnurPOvZMVKH1XjBo5arM7Kz/ EgsIad0A==; Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcXQf-001ZcL-Qk for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 17:59:55 +0000 Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FX0Ny6hwZz6wkr8; Sat, 1 May 2021 01:54:10 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml744-chm.china.huawei.com (10.206.15.225) 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:59:52 +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:59:51 +0100 Date: Fri, 30 Apr 2021 18:58:16 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Alexandre Torgue , Hugues Fruchet , "Mauro Carvalho Chehab" , Maxime Coquelin , , , , Subject: Re: [PATCH v4 73/79] media: stm32: use pm_runtime_resume_and_get() Message-ID: <20210430185816.00000ef5@Huawei.com> In-Reply-To: References: 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210430_105954_050621_564C49C1 X-CRM114-Status: GOOD ( 15.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 28 Apr 2021 16:52:34 +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. > > 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/platform/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 = 0; > int ret; > > - ret = pm_runtime_get_sync(dcmi->dev); > + ret = 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; maybe err_unlocked; to indicate the lock isn't held. This briefly confused me. > } > > ret = media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline); > @@ -848,6 +848,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) > > err_pm_put: > pm_runtime_put(dcmi->dev); > +err_unlock: > spin_lock_irq(&dcmi->irqlock); > /* > * Return all buffers to vb2 in QUEUED state. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel