On Tue, Mar 21, 2023 at 09:26:29AM +0100, Krzysztof Kozlowski wrote: > On 21/03/2023 09:24, Arnd Bergmann wrote: > > On Tue, Mar 21, 2023, at 09:21, Krzysztof Kozlowski wrote: > >> On 21/03/2023 09:11, Arnd Bergmann wrote: > >>> On Sun, Mar 12, 2023, at 14:13, Krzysztof Kozlowski wrote: > >>>> The driver can match only via the DT table so the table should be always > >>>> used and the of_match_ptr does not have any sense (this also allows ACPI > >>>> matching via PRP0001, even though it might not be relevant here). This > >>>> also fixes !CONFIG_OF error: > >>>> > >>>> drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c:1890:38: error: > >>>> ‘mtk8195_jpegdec_drvdata’ defined but not used > >>>> [-Werror=unused-const-variable=] > >>>> > >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > >>> > >>> I see now that we both submitted the same patch, but now Hans > >> > >> We as you and me? I cannot find your patch on lore: > >> https://lore.kernel.org/all/?q=f%3Aarnd%40arndb.de > > > > This is the one that I sent back in January: > > > > https://lore.kernel.org/all/20230117172644.3044265-1-arnd@xxxxxxxxxx > > Uh, that's from January! It's still waiting in Patchwork: > https://patchwork.linuxtv.org/project/linux-media/patch/20230117172644.3044265-1-arnd@xxxxxxxxxx/ Yes... this still makes sense, to remove of_match_ptr(). I rebased this, resulting in: >From 230cfaabcd2d5a5f0bc74e113fe84f95028bcdc5 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> Date: Sun, 12 Mar 2023 14:13:10 +0100 Subject: [PATCH v2 20/28] media: platform: jpeg: always reference OF data The driver can match only via the DT table so the table should be always used and the of_match_ptr does not have any sense (this also allows ACPI matching via PRP0001, even though it might not be relevant here). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> [Sakari Ailus: Rebased on media tree master, reword commit message.] Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> --- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index 0051f372a66cf..8bcbaa9658bac 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1866,7 +1866,6 @@ static const struct dev_pm_ops mtk_jpeg_pm_ops = { SET_RUNTIME_PM_OPS(mtk_jpeg_pm_suspend, mtk_jpeg_pm_resume, NULL) }; -#if defined(CONFIG_OF) static const struct mtk_jpeg_variant mt8173_jpeg_drvdata = { .clks = mt8173_jpeg_dec_clocks, .num_clks = ARRAY_SIZE(mt8173_jpeg_dec_clocks), @@ -1949,14 +1948,13 @@ static const struct of_device_id mtk_jpeg_match[] = { }; MODULE_DEVICE_TABLE(of, mtk_jpeg_match); -#endif static struct platform_driver mtk_jpeg_driver = { .probe = mtk_jpeg_probe, .remove_new = mtk_jpeg_remove, .driver = { .name = MTK_JPEG_NAME, - .of_match_table = of_match_ptr(mtk_jpeg_match), + .of_match_table = mtk_jpeg_match, .pm = &mtk_jpeg_pm_ops, }, }; -- 2.30.2 -- Sakari Ailus
