Message ID | 20230312131318.351173-20-krzysztof.kozlowski@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp714293wrd; Sun, 12 Mar 2023 06:21:59 -0700 (PDT) X-Google-Smtp-Source: AK7set/W7zbC77arIHB19OX8K+6uAmHSviw2eK47O//rkRn17BW+6+kj21QxtxA5m1ltY6TDJWf8 X-Received: by 2002:a17:902:c102:b0:19a:b5cd:6e73 with SMTP id 2-20020a170902c10200b0019ab5cd6e73mr6440315pli.3.1678627318735; Sun, 12 Mar 2023 06:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678627318; cv=none; d=google.com; s=arc-20160816; b=T6/bZ60rv88HqefLEoNXCq/FYdlKHo/8ZT1HdZ5yWMdepmL7vrvX+uJZShSBP7iaE4 AVVZXm5hAtD4UGaRPv0LQTNamBJAkjLfBIAd8YCaNnmow2AuNRP+uAD6maSya6jlm3ca ZqxZcSAVROaAAPywjzfq/wFx7XQ66kZ/MUWQMKRO8Eyo9EB6jN7czmCugemqTljBRwmG H+qgijeaUHYlp+ZPqUBts/ERnvpX1i53bHQqKIOqCMcDDOwzpsQ4YabBx6kRCS1vR+Sz fjwyOZyciQp8/vvOF9LQsSFayclO+33vw4pCnsgFAmyR1ocvp/2jHfaXLYP/m9+rTjZn Mo7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Z7zCiKznvtISJjaLkQGP6+7WjJ33gWstbauf9XZGz6U=; b=Saqt02JoacsRgGbjOiC17SeApAd4ajFsPKkSidXnzwMXdXwI7QYPQG9QBwYs152axi 3dVOh75FHYIzPaLEWzQLLE9KrCV6lI6kJGcHi9SzLvwI5EFI8TGAs2nJSuJSEC7+gFym ZlNSLpVXXfHXS0+PMJUlbSgB3pQm/NhTUKmYCYxsS0iHm1cYIXMiS62F5iyykstYVS49 miRA2sOLQbCpckykI7z5GuXXKPKWuHC1cpHgg6HoojYyZWKEplW4pT5LCEi4zQfo2hg1 rSwt7JCcOfC0MkaRzzB12QjU26d46lHsgtEQr7ZU/orGhQ3iY7SKCpg+oMSEV67/Fvyh v0yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hkgeQTl7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z3-20020a170902ccc300b0019cd5aec725si4484002ple.555.2023.03.12.06.21.46; Sun, 12 Mar 2023 06:21:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hkgeQTl7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230313AbjCLNPd (ORCPT <rfc822;realc9580@gmail.com> + 99 others); Sun, 12 Mar 2023 09:15:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230062AbjCLNOu (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 12 Mar 2023 09:14:50 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC20A2412D for <linux-kernel@vger.kernel.org>; Sun, 12 Mar 2023 06:14:03 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id x3so38435411edb.10 for <linux-kernel@vger.kernel.org>; Sun, 12 Mar 2023 06:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678626843; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z7zCiKznvtISJjaLkQGP6+7WjJ33gWstbauf9XZGz6U=; b=hkgeQTl7kiZH/3Q54ASwYRPqBYEKm9l2FvNF4N6ujUzpjYBOHSlr9uaGtfsFgk5dUy Lf7kyZH3h1JJOZsT/VqnMhAwIr9habC6FILxMvlJg+5lDE8Gm8v9LoOiSX0AgLvzYOXV D1eMF/v8xIRnSfqePFrzRlbuWXhKfLcsc5BxUvRxpTQsE40ns4iU8iLxwlkwixvZdt1i plgBO2DlKmx7mC/7hZlCbT6NpXJAd3vc/duYJ32+zVYAhmGzyshA+m/npMOTDXiqIciY cqtNGAb85Dl+16dZ0hHPIPDKjL/nPIK6PpZ9XRG6VOw8dR+hyXC1DPyCGKqcyAUvnNbP D7MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678626843; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z7zCiKznvtISJjaLkQGP6+7WjJ33gWstbauf9XZGz6U=; b=ibikctfxw64/Fmx2xstAj5WHE8pzPg1DOR6KEwcF5pXJMQrjDZkyH+I6uly1NV0QzF GqK2mpP8ASrO4DicGVaGAm32RWZJXK8BEThRHfG5jn350wrcj5aHfqjoF5YOM39qFKVS mPKP9uv0WklSQydtVsIubiou+ncxI3SJgvx+wsw+68OLtDLs5LV8cK5sA3Xd3pMGNmWd oS/xyEuBgJxU/pjiSFPX5cn5r6b3kiGDpssFoxUag8NWDVPzIxddUPumP0Rme8aGLMrW TyKlfGdmhVTyQavL5wqLSiDZLu+ZpoUrLh6kQlkRTTCpoT1hfWubfSerQPDIEnFBSN2U 7i9A== X-Gm-Message-State: AO0yUKXENKau4jxpDTknKs6wGTOJW4Mv0HqDWwN+DcGy8kEgCH5bDBPV FTJx2LhLYn+skLKkmMJYjkBtQg== X-Received: by 2002:a17:906:855:b0:921:c122:52a7 with SMTP id f21-20020a170906085500b00921c12252a7mr4317759ejd.22.1678626843141; Sun, 12 Mar 2023 06:14:03 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:d9f6:3e61:beeb:295a]) by smtp.gmail.com with ESMTPSA id r19-20020a1709067fd300b008eddbd46d7esm2213279ejs.31.2023.03.12.06.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 06:14:02 -0700 (PDT) From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: Joe Tessler <jrt@google.com>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org>, Neil Armstrong <neil.armstrong@linaro.org>, Kevin Hilman <khilman@baylibre.com>, Jerome Brunet <jbrunet@baylibre.com>, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Manivannan Sadhasivam <mani@kernel.org>, Michael Tretter <m.tretter@pengutronix.de>, Pengutronix Kernel Team <kernel@pengutronix.de>, Jacopo Mondi <jacopo+renesas@jmondi.org>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, =?utf-8?q?Nik?= =?utf-8?q?las_S=C3=B6derlund?= <niklas.soderlund+renesas@ragnatech.se>, Rui Miguel Silva <rmfrfs@gmail.com>, Wenyou Yang <wenyou.yang@microchip.com>, Bin Liu <bin.liu@mediatek.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Minghsiu Tsai <minghsiu.tsai@mediatek.com>, Houlong Wei <houlong.wei@mediatek.com>, Andrew-CT Chen <andrew-ct.chen@mediatek.com>, Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>, Jacek Anaszewski <jacek.anaszewski@gmail.com>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Patrice Chotard <patrice.chotard@foss.st.com>, Yong Deng <yong.deng@magewell.com>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org>, "Lad, Prabhakar" <prabhakar.csengg@gmail.com>, Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>, Philipp Zabel <p.zabel@pengutronix.de>, Sean Young <sean@mess.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-rockchip@lists.infradead.org Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH 20/28] media: platform: jpeg: always reference OF data Date: Sun, 12 Mar 2023 14:13:10 +0100 Message-Id: <20230312131318.351173-20-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230312131318.351173-1-krzysztof.kozlowski@linaro.org> References: <20230312131318.351173-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760168319187760522?= X-GMAIL-MSGID: =?utf-8?q?1760168319187760522?= |
Series |
[01/28] media: cec: ch7322: drop of_match_ptr for ID table
|
|
Commit Message
Krzysztof Kozlowski
March 12, 2023, 1:13 p.m. UTC
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@linaro.org>
---
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Comments
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@linaro.org> I see now that we both submitted the same patch, but now Hans merged a worse fix [1] without a changelog text. Arnd https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=4ae47770d57bff01
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@linaro.org> > > 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 > merged a worse fix [1] without a changelog text. > > Arnd > > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=4ae47770d57bff01 Uh, I can rebase my patchset. Best regards, Krzysztof
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@linaro.org> >> >> 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@kernel.org Arnd
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@linaro.org> >>> >>> 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@kernel.org Uh, that's from January! It's still waiting in Patchwork: https://patchwork.linuxtv.org/project/linux-media/patch/20230117172644.3044265-1-arnd@kernel.org/ Best regards, Krzysztof
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@linaro.org> > >>> > >>> 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@kernel.org > > Uh, that's from January! It's still waiting in Patchwork: > https://patchwork.linuxtv.org/project/linux-media/patch/20230117172644.3044265-1-arnd@kernel.org/ 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@linaro.org> 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@linaro.org> [Sakari Ailus: Rebased on media tree master, reword commit message.] Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- 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, }, };
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index 969516a940ba..bd12e73492e5 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1898,7 +1898,6 @@ static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata = { .cap_q_default_fourcc = V4L2_PIX_FMT_YUV420M, }; -#if defined(CONFIG_OF) static const struct of_device_id mtk_jpeg_match[] = { { .compatible = "mediatek,mt8173-jpgdec", @@ -1924,14 +1923,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 = 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, }, };