From patchwork Sun Mar 12 13:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13171440 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8FE34C6FD1F for ; Sun, 12 Mar 2023 13:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pM8b5XGBiAflwvu9iGBis2wG1rMurPxglcoh7hCuRrU=; b=E337vg2yJFni/3 oEcKWz+8s8X3O+552NjX71212rtua6W/LotXJI0yASi2WF58lOlEIoLntRcYfIrELwNVClv1PZe+3 Jd13NgNZuFwdn2APdgpD3go3E5B2vW6TdeQlRC+JVbrd/vbHAV5IgjX2kuKJunEgS4khBJtR8npRw +tYCi1Bk/5bJ2pYlmlbH8NuxFOziaj35EF6MM+8ZTn9Nx33JWh9FABT9+bRtWmdu5tl/t0AiDStK5 sQd075XJu/ClrfD258w4CJzd4zXEFYtfAhFMfOfI7Ksc9YezB+7nPFba8o+gN4mS0tq9GHld5o1O2 VIOvPzM1Xe0VxiYEZWkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbLgY-002Nvz-Ce; Sun, 12 Mar 2023 13:24:26 +0000 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbLWV-002ION-Ol for linux-rockchip@lists.infradead.org; Sun, 12 Mar 2023 13:14:06 +0000 Received: by mail-ed1-x52f.google.com with SMTP id k10so38406266edk.13 for ; 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=pbx2nkQwVyI5vw6Nt84jguKRK6SYCgds4TFt62COMLJmVhB9q9I1H3mIGPoyuggqUk aGdygpAU5Qzv9MXRzGUIh2P8DW0yNY9ViqL0Pe8KTXqFR5g26NeEy7/4rum6UnjvswWk a/QfEoO1UE8UR98VZJhPJk7tY8As7GH4gjLEAB980tYycUtBdNGq+sR5KCKArbOfTsPB d36iRm9Q6scJu2hKkJRUIjvLY0fGNy9dDQzbmSKmeGxN2Oquzw5gv7E39795NUwNrMRH KSaiDydPRRCmVHs7GeI+X+SwgaBwA5hjQuFvhPax4PVdeA87jXlht7w7P9GKodgv2aDz uNOw== X-Gm-Message-State: AO0yUKXkbBTLYvX5Gk7mTppJkBZ5SWH8r+nYyONUPHWMGT1k7HI/ZmrR 4WvC9nRr78UzMitVeXR18m/jjg== X-Google-Smtp-Source: AK7set9rwzHv7NjHz3Ld8t1U7IlpFCFMC7/C2h9WMvqIP99asEQnOhRylPIAm1sXrRZyif38WBVBkg== 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 To: Joe Tessler , Hans Verkuil , Mauro Carvalho Chehab , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Thierry Reding , Jonathan Hunter , Manivannan Sadhasivam , Michael Tretter , Pengutronix Kernel Team , Jacopo Mondi , Kieran Bingham , Laurent Pinchart , =?utf-8?q?Nik?= =?utf-8?q?las_S=C3=B6derlund?= , Rui Miguel Silva , Wenyou Yang , Bin Liu , Matthias Brugger , AngeloGioacchino Del Regno , Minghsiu Tsai , Houlong Wei , Andrew-CT Chen , Andrzej Pietrasiewicz , Jacek Anaszewski , Sylwester Nawrocki , Patrice Chotard , Yong Deng , Paul Kocialkowski , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , "Lad, Prabhakar" , Ezequiel Garcia , Philipp Zabel , Sean Young , 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230312_061404_008240_32EC8843 X-CRM114-Status: GOOD ( 14.45 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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 Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sakari Ailus --- 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 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, }, };