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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CEF6C433FE for ; Thu, 2 Dec 2021 00:10:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354103AbhLBANz (ORCPT ); Wed, 1 Dec 2021 19:13:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344135AbhLBANi (ORCPT ); Wed, 1 Dec 2021 19:13:38 -0500 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C7AC061758 for ; Wed, 1 Dec 2021 16:10:11 -0800 (PST) Received: by mail-qk1-x736.google.com with SMTP id 193so32982173qkh.10 for ; Wed, 01 Dec 2021 16:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=55WStG4Y7XlDovmlmdz+wvG6EaacgKrZKMN/wNUPDPc=; b=NlFNrvHDX4WGr/52aCDlG+suYiNBw8eVzKVICQV7J8Elq1W5jJyjHPnT/rvgT6XOA7 vgsZQTED1c0q5GR7VRRuSLlaLQdHFnWtrmapHOMPSz4DfK1FrLrATzaSOkKooY3aCHSV ZumUeV+X0TEDlVR72CWqMttnlvY9+YcNt6OMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=55WStG4Y7XlDovmlmdz+wvG6EaacgKrZKMN/wNUPDPc=; b=fsm8ex4rtkBrk/LePrAMIjtY2iMQ6EXO7znrg9YLZIlE7IdP3XLy9p+HfkbXHx85I0 tTqS0TX4yfl8vS07QG+4Ot6E7GJMaddeQ6y9NkRx50ku2aQWlS3JZUYfIyol34b8Jhcq 3E08G/VatcK7rVn2aixihZCy941QZvOX5aGeEN8QyTHaxeeLllEDIBETKAV5HCykeeFn qSQIwePCETarFaDsDTZISe1kcRCXcGKCf12mXlouoewJ8JjPqRIOhT2Kj5XdiGGSyH3m 5oI406RhP3row483OmWsGCn/PZKCvay2HJbeNB1z3ixcsRhHpAixtWyzjo9YroAIkoLF paxQ== X-Gm-Message-State: AOAM532lz2MNW6LpSiDlBmszTUzvf2Hvr+8dT48HP4GuS0vguuF3QQZh +Znok0gJzTWFQVoE1VbzxPUOlu/LpsuTbAWePdBUuA== X-Google-Smtp-Source: ABdhPJwnxcMhCHSmQbCaz9VZX6btqW3BmzytBcMVvCB83INeGr8SdIdEK+AnZ0JqT5Dl4lJC/zQNylftsh/c62mi930= X-Received: by 2002:a37:e20d:: with SMTP id g13mr9677715qki.121.1638403810885; Wed, 01 Dec 2021 16:10:10 -0800 (PST) MIME-Version: 1.0 References: <20211129034201.5767-1-yunfei.dong@mediatek.com> <20211129034201.5767-4-yunfei.dong@mediatek.com> In-Reply-To: <20211129034201.5767-4-yunfei.dong@mediatek.com> From: Steve Cho Date: Wed, 1 Dec 2021 16:10:00 -0800 Message-ID: Subject: Re: [PATCH v11, 03/19] media: mtk-vcodec: Refactor vcodec pm interface To: Yunfei Dong Cc: Alexandre Courbot , Hans Verkuil , Tzung-Bi Shih , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Hsin-Yi Wang , Fritz Koenig , Dafna Hirschfeld , Benjamin Gaignard , Daniel Vetter , dri-devel , Irui Wang , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, srv_heupstream@mediatek.com, linux-mediatek@lists.infradead.org, Project_Global_Chrome_Upstream_Group@mediatek.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Reviewed-by: Steve Cho On Sun, Nov 28, 2021 at 7:44 PM Yunfei Dong wrote: > > Using the needed param for pm init/release function and remove unused > param mtkdev in 'struct mtk_vcodec_pm'. nit: How about s/needed param/needed params |pdev| and |pm|/ ? > Reviewed-by: Tzung-Bi Shih > Reviewed-by: AngeloGioacchino Del Regno > Signed-off-by: Yunfei Dong > --- > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 6 ++--- > .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 22 ++++++++----------- > .../platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 5 +++-- > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 1 - > .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 1 - > 5 files changed, 15 insertions(+), 20 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > index 055d50e52720..3ac4c3935e4e 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > @@ -249,7 +249,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > if (IS_ERR(dev->fw_handler)) > return PTR_ERR(dev->fw_handler); > > - ret = mtk_vcodec_init_dec_pm(dev); > + ret = mtk_vcodec_init_dec_pm(dev->plat_dev, &dev->pm); > if (ret < 0) { > dev_err(&pdev->dev, "Failed to get mt vcodec clock source"); > goto err_dec_pm; > @@ -378,7 +378,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > err_dec_alloc: > v4l2_device_unregister(&dev->v4l2_dev); > err_res: > - mtk_vcodec_release_dec_pm(dev); > + mtk_vcodec_release_dec_pm(&dev->pm); > err_dec_pm: > mtk_vcodec_fw_release(dev->fw_handler); > return ret; > @@ -418,7 +418,7 @@ static int mtk_vcodec_dec_remove(struct platform_device *pdev) > video_unregister_device(dev->vfd_dec); > > v4l2_device_unregister(&dev->v4l2_dev); > - mtk_vcodec_release_dec_pm(dev); > + mtk_vcodec_release_dec_pm(&dev->pm); > mtk_vcodec_fw_release(dev->fw_handler); > return 0; > } > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > index 6038db96f71c..20bd157a855c 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > @@ -13,18 +13,15 @@ > #include "mtk_vcodec_dec_pm.h" > #include "mtk_vcodec_util.h" > > -int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) > +int mtk_vcodec_init_dec_pm(struct platform_device *pdev, > + struct mtk_vcodec_pm *pm) > { > struct device_node *node; > - struct platform_device *pdev; > - struct mtk_vcodec_pm *pm; > + struct platform_device *larb_pdev; > struct mtk_vcodec_clk *dec_clk; > struct mtk_vcodec_clk_info *clk_info; > int i = 0, ret = 0; > > - pdev = mtkdev->plat_dev; > - pm = &mtkdev->pm; > - pm->mtkdev = mtkdev; > dec_clk = &pm->vdec_clk; > node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0); > if (!node) { > @@ -32,13 +29,12 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) > return -1; > } > > - pdev = of_find_device_by_node(node); > + larb_pdev = of_find_device_by_node(node); > of_node_put(node); > - if (WARN_ON(!pdev)) { > + if (WARN_ON(!larb_pdev)) { > return -1; > } > - pm->larbvdec = &pdev->dev; > - pdev = mtkdev->plat_dev; > + pm->larbvdec = &larb_pdev->dev; > pm->dev = &pdev->dev; > > dec_clk->clk_num = > @@ -82,10 +78,10 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) > return ret; > } > > -void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev) > +void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm) > { > - pm_runtime_disable(dev->pm.dev); > - put_device(dev->pm.larbvdec); > + pm_runtime_disable(pm->dev); > + put_device(pm->larbvdec); > } > > int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm) > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > index 280aeaefdb65..a3df6aef6cb9 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > @@ -9,8 +9,9 @@ > > #include "mtk_vcodec_drv.h" > > -int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *dev); > -void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev); > +int mtk_vcodec_init_dec_pm(struct platform_device *pdev, > + struct mtk_vcodec_pm *pm); > +void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm); > > int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm); > void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm); > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > index 1d2370608d0d..0fa9d85114b9 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > @@ -195,7 +195,6 @@ struct mtk_vcodec_pm { > struct mtk_vcodec_clk venc_clk; > struct device *larbvenc; > struct device *dev; > - struct mtk_vcodec_dev *mtkdev; > }; > > /** > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > index 1b2e4930ed27..0c8c8f86788c 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > @@ -26,7 +26,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) > pdev = mtkdev->plat_dev; > pm = &mtkdev->pm; > memset(pm, 0, sizeof(struct mtk_vcodec_pm)); > - pm->mtkdev = mtkdev; > pm->dev = &pdev->dev; > dev = &pdev->dev; > enc_clk = &pm->venc_clk; > -- > 2.25.1 >