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 71913C43460 for ; Fri, 30 Apr 2021 17:06:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45D4D6140C for ; Fri, 30 Apr 2021 17:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230496AbhD3RHm (ORCPT ); Fri, 30 Apr 2021 13:07:42 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2968 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229902AbhD3RHl (ORCPT ); Fri, 30 Apr 2021 13:07:41 -0400 Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWz6066bWz689R8; Sat, 1 May 2021 00:56:08 +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:06:51 +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:06:50 +0100 Date: Fri, 30 Apr 2021 18:05:15 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Chen-Yu Tsai , Greg Kroah-Hartman , "Jernej Skrabec" , Mauro Carvalho Chehab , Maxime Ripard , Paul Kocialkowski , , , , Subject: Re: [PATCH v4 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Message-ID: <20210430180515.0000134f@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:51:45 +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 Acked-by: Jonathan Cameron > --- > 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/staging/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) > } > > if (V4L2_TYPE_IS_OUTPUT(vq->type)) { > - ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) { > - pm_runtime_put_noidle(dev->dev); > + ret = pm_runtime_resume_and_get(dev->dev); > + if (ret < 0) > goto err_cleanup; > - } > > if (dev->dec_ops[ctx->current_codec]->start) { > ret = dev->dec_ops[ctx->current_codec]->start(ctx); 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,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 B350AC433B4 for ; Fri, 30 Apr 2021 17:06:57 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 7008E61107 for ; Fri, 30 Apr 2021 17:06:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7008E61107 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2D48F84A4D; Fri, 30 Apr 2021 17:06:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j6AFwXwUHk3j; Fri, 30 Apr 2021 17:06:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 2BFDB84A50; Fri, 30 Apr 2021 17:06:56 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 785BF1BF381 for ; Fri, 30 Apr 2021 17:06:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 670B76F965 for ; Fri, 30 Apr 2021 17:06:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d6FQDdDcc33C for ; Fri, 30 Apr 2021 17:06:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id BBF1A6F97D for ; Fri, 30 Apr 2021 17:06:53 +0000 (UTC) Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWz6066bWz689R8; Sat, 1 May 2021 00:56:08 +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:06:51 +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:06:50 +0100 Date: Fri, 30 Apr 2021 18:05:15 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab Subject: Re: [PATCH v4 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Message-ID: <20210430180515.0000134f@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-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Jernej Skrabec , Greg Kroah-Hartman , linuxarm@huawei.com, Maxime Ripard , linux-kernel@vger.kernel.org, Paul Kocialkowski , Chen-Yu Tsai , mauro.chehab@huawei.com, Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" On Wed, 28 Apr 2021 16:51:45 +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 Acked-by: Jonathan Cameron > --- > 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/staging/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) > } > > if (V4L2_TYPE_IS_OUTPUT(vq->type)) { > - ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) { > - pm_runtime_put_noidle(dev->dev); > + ret = pm_runtime_resume_and_get(dev->dev); > + if (ret < 0) > goto err_cleanup; > - } > > if (dev->dec_ops[ctx->current_codec]->start) { > ret = dev->dec_ops[ctx->current_codec]->start(ctx); _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel 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,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 98322C433B4 for ; Fri, 30 Apr 2021 17:09:01 +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 4F3DA6140C for ; Fri, 30 Apr 2021 17:09:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F3DA6140C 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=nGlhRNEcFRm+kfDY7LCQ/FZ/W0q4cAyI+SbNd2ehtnY=; b=hWUd986FNjrruQ4GwTONpi6rA iRmEPAFoMuCjUuhWIR6Q0GHgIL2RRNMd4uBBQqAqJN3jsRXdfsJ3jdaZ2vZ9nDLf1REl7ND2ACzC0 +eKJxgvRNOVKfSwQRhRUbj+aQ9SWdTZJoNwSJVAxka4V1J8zmdSNN9p+bofVRBJYNQ7d3WpLM6les bZTUOCMxlcKp2bHu2YjrpiGx2ifnaBpxFYX1INRVvRlkCzPqAqZtRpZAhiVBDO562ZsA2CpNAo9Jn SEkVTisNMaYSalp1csumHv94tlWt/GoWqgMaT3xcvwuAN7MUTBS3DzPOPx6HB25FKGBPAlyvCKacs BNdscsrxQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lcWbV-008Gno-EU; Fri, 30 Apr 2021 17:07:01 +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 1lcWbS-008Gne-Gb for linux-arm-kernel@desiato.infradead.org; Fri, 30 Apr 2021 17:06:58 +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=9N9ouzd+BVXs8oqvXKSCOyBtXg3tDUPE3tuE/f85VEI=; b=fBPmCrUFB3aF7O3OzGxGSFk3/i 4dbWkv+3pbYZjWVgK7eaIqygQqtv+h8CC5GWN7gdgKmKyvQaP0eMh/BR+JmxIIfQYLCAueTj8Fkms QPCr4Gg9hEiI22o2nmNUDCYoxAvolADDNJk7yUpxy2uVi9hhF5+U0KcBu20EmDjmfmT9rKrz4VzUo 1o2Oid/N6rBcJuhCgVVzK7oUTNb1MUW76nFvN3JmprEJ2tfxL5XxKiEt1aBoDHN7MO4xanXV9JMyu xrTOdu9pWkyyNqItiqG+Rh4eMbNFw3W39a27NTKmQgCf8xBnJkhMuFvS1qRln3GO0O260kWSpjW0B EMfTXgaA==; Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lcWbP-001XpQ-2E for linux-arm-kernel@lists.infradead.org; Fri, 30 Apr 2021 17:06:56 +0000 Received: from fraeml744-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWz6066bWz689R8; Sat, 1 May 2021 00:56:08 +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:06:51 +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:06:50 +0100 Date: Fri, 30 Apr 2021 18:05:15 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Chen-Yu Tsai , Greg Kroah-Hartman , "Jernej Skrabec" , Mauro Carvalho Chehab , Maxime Ripard , Paul Kocialkowski , , , , Subject: Re: [PATCH v4 24/79] staging: media: cedrus_video: use pm_runtime_resume_and_get() Message-ID: <20210430180515.0000134f@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_100655_264106_492D987A X-CRM114-Status: GOOD ( 15.52 ) 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:51:45 +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 Acked-by: Jonathan Cameron > --- > 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/staging/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) > } > > if (V4L2_TYPE_IS_OUTPUT(vq->type)) { > - ret = pm_runtime_get_sync(dev->dev); > - if (ret < 0) { > - pm_runtime_put_noidle(dev->dev); > + ret = pm_runtime_resume_and_get(dev->dev); > + if (ret < 0) > goto err_cleanup; > - } > > if (dev->dec_ops[ctx->current_codec]->start) { > ret = dev->dec_ops[ctx->current_codec]->start(ctx); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel