From nobody Sat May 10 03:07:05 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=1620314876; cv=none; d=zohomail.com; s=zohoarc; b=cddrQKcNgZMCu0Tl8ZAQkpUaIUDg9+UPTPFeWkdYNrJTuM6/AwpdT0peBFY2TprRAEHKjVb919kc+rJlsKXUZLuYF6MWLLlbWOWKBhQVJO28vBvIbp1O/Ma86nZakKWKY3aNTPicu4kw4yx1tITiBYthvu6z4Nlo1er2RccZwgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620314876; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q4DZtwNaCJb5JYzm3llYCRUXQR3+cupQcOmVDFzIYYE=; b=htHglsEK84gS1EHg9vVOyKRoQjWwWwiuq7+pk/lYHWTAP1+zlEXzrARmEWJOYJ20+12hffYC6Mv+Qf46MCboYaCCQWJKyi6LngrTB1P+zrv2S3qaIYA4zwZpNmiOE7A3eybAxLN00uTZ/89kGwTE2jMyOsTy6T9dWAyWSd6VHyg= 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 1620314876927603.3528125336157; Thu, 6 May 2021 08:27:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235744AbhEFP2w (ORCPT ); Thu, 6 May 2021 11:28:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:40900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235452AbhEFP1n (ORCPT ); Thu, 6 May 2021 11:27:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BA4C66194C; Thu, 6 May 2021 15:26:23 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1left8-000SCR-C7; Thu, 06 May 2021 17:26:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620314783; bh=xG6JnysSxfWd3aUelNVSSL+9ckiOYfdOZj8pIwxAXDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LY480GhqfCXusMjUoczZcVXeOz/0xYAX/WTSEmnRnVBR/t347ct7ahedVlVqRo+aE TblPTYe+laOCe0eSFPTkG2xMjc56zPa5FtQLit4pMgtUbyKoLNHRvAhOGkifCtcrYa 1MuynXQRuGCb/MOxw5iWNYote7Z1wqecDpi7MgX2jpHHnWDjmO8jqZicGTGfSw6CW6 1H/k2tLO/GeohygkO+kUnbYwWoBi5HlVrftF3khUU2j6iwUcNEuvFpmv+TDp6le3NR hvgO+Y/oeWfjRLG6ORxU1RtpO7/nEl5422kisMDetbQPoSepFaSmH2LU+F9RbkR8EB XEdMlKKvS/PzA== 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 v5 22/25] media: ti-vpe: use pm_runtime_resume_and_get() Date: Thu, 6 May 2021 17:26:00 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal wi= th usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/ti-vpe/cal-video.c | 4 +++- drivers/media/platform/ti-vpe/cal.c | 8 +++++--- drivers/media/platform/ti-vpe/vpe.c | 8 +++----- 3 files changed, 11 insertions(+), 9 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..5b1c5d96a407 100644 --- a/drivers/media/platform/ti-vpe/vpe.c +++ b/drivers/media/platform/ti-vpe/vpe.c @@ -2471,11 +2471,9 @@ 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; + return r; } =20 static void vpe_runtime_put(struct platform_device *pdev) @@ -2580,7 +2578,7 @@ static int vpe_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); =20 ret =3D vpe_runtime_get(pdev); - if (ret) + if (ret < 0) goto rel_m2m; =20 /* Perform clk enable followed by reset */ --=20 2.30.2