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=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 808AAC43461 for ; Wed, 5 May 2021 12:28:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DEAB611AC for ; Wed, 5 May 2021 12:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233278AbhEEM3w (ORCPT ); Wed, 5 May 2021 08:29:52 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3023 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231633AbhEEM3v (ORCPT ); Wed, 5 May 2021 08:29:51 -0400 Received: from fraeml735-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FZwm33Mzmz6rlcW; Wed, 5 May 2021 20:20:51 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml735-chm.china.huawei.com (10.206.15.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 5 May 2021 14:28:53 +0200 Received: from localhost (10.52.120.138) 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; Wed, 5 May 2021 13:28:52 +0100 Date: Wed, 5 May 2021 13:27:13 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , Ezequiel Garcia , Hans Verkuil , "Krzysztof Kozlowski" , Mauro Carvalho Chehab , Sylwester Nawrocki , , , , Subject: Re: [PATCH 07/25] media: exynos-gsc: don't resume at remove time Message-ID: <20210505132713.000000ba@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.120.138] X-ClientProxiedBy: lhreml725-chm.china.huawei.com (10.201.108.76) 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, 5 May 2021 11:41:57 +0200 Mauro Carvalho Chehab wrote: > 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, change the logic in order to disable PM runtime earlier. > > Reviewed-by: Sylwester Nawrocki > Signed-off-by: Mauro Carvalho Chehab Seems sensible and a lot more along the lines of what I'd expect to see than was originally here. Reviewed-by: Jonathan Cameron > --- > drivers/media/platform/exynos-gsc/gsc-core.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c > index 9f41c2e7097a..f49f3322f835 100644 > --- a/drivers/media/platform/exynos-gsc/gsc-core.c > +++ b/drivers/media/platform/exynos-gsc/gsc-core.c > @@ -1210,18 +1210,19 @@ static int gsc_remove(struct platform_device *pdev) > struct gsc_dev *gsc = platform_get_drvdata(pdev); > int i; > > - pm_runtime_get_sync(&pdev->dev); > - > gsc_unregister_m2m_device(gsc); > v4l2_device_unregister(&gsc->v4l2_dev); > > vb2_dma_contig_clear_max_seg_size(&pdev->dev); > - for (i = 0; i < gsc->num_clocks; i++) > - clk_disable_unprepare(gsc->clock[i]); > > - pm_runtime_put_noidle(&pdev->dev); > pm_runtime_disable(&pdev->dev); > > + if (!pm_runtime_status_suspended(&pdev->dev)) > + for (i = 0; i < gsc->num_clocks; i++) > + clk_disable_unprepare(gsc->clock[i]); > + > + pm_runtime_set_suspended(&pdev->dev); > + > dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); > return 0; > }