Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Krzysztof Kozlowski <krzk@kernel.org>
To:     linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>, alsa-devel@alsa-project.org
Cc:     Krzysztof Kozlowski <krzk@kernel.org>,
        Patrick Lai <plai@codeaurora.org>,
        Banajit Goswami <bgoswami@codeaurora.org>,
        Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Subject: [PATCH 08/38] ASoC: qcom: drop of_match_ptr from of_device_id table
Date:   Fri, 20 Nov 2020 17:16:22 +0100
Message-Id: <20201120161653.445521-8-krzk@kernel.org>
In-Reply-To: <20201120161653.445521-1-krzk@kernel.org>
References: <20201120161653.445521-1-krzk@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

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 is not relevant here).  This fixes
compile warning (!CONFIG_OF on x86_64):

  sound/soc/qcom/lpass-apq8016.c:294:34: warning: ‘apq8016_lpass_cpu_device_id’ defined but not used [-Wunused-const-variable=]

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
 sound/soc/qcom/apq8016_sbc.c   | 2 +-
 sound/soc/qcom/lpass-apq8016.c | 2 +-
 sound/soc/qcom/lpass-ipq806x.c | 2 +-
 sound/soc/qcom/lpass-sc7180.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
index 575e2aefefe3..cc8c3f929683 100644
--- a/sound/soc/qcom/apq8016_sbc.c
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -176,7 +176,7 @@ MODULE_DEVICE_TABLE(of, apq8016_sbc_device_id);
 static struct platform_driver apq8016_sbc_platform_driver = {
 	.driver = {
 		.name = "qcom-apq8016-sbc",
-		.of_match_table = of_match_ptr(apq8016_sbc_device_id),
+		.of_match_table = apq8016_sbc_device_id,
 	},
 	.probe = apq8016_sbc_platform_probe,
 };
diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c
index 0aedb3a0a798..4ee1de6588bb 100644
--- a/sound/soc/qcom/lpass-apq8016.c
+++ b/sound/soc/qcom/lpass-apq8016.c
@@ -300,7 +300,7 @@ MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id);
 static struct platform_driver apq8016_lpass_cpu_platform_driver = {
 	.driver	= {
 		.name		= "apq8016-lpass-cpu",
-		.of_match_table	= of_match_ptr(apq8016_lpass_cpu_device_id),
+		.of_match_table	= apq8016_lpass_cpu_device_id,
 	},
 	.probe	= asoc_qcom_lpass_cpu_platform_probe,
 	.remove	= asoc_qcom_lpass_cpu_platform_remove,
diff --git a/sound/soc/qcom/lpass-ipq806x.c b/sound/soc/qcom/lpass-ipq806x.c
index 832a9161484e..421d65a546f3 100644
--- a/sound/soc/qcom/lpass-ipq806x.c
+++ b/sound/soc/qcom/lpass-ipq806x.c
@@ -170,7 +170,7 @@ MODULE_DEVICE_TABLE(of, ipq806x_lpass_cpu_device_id);
 static struct platform_driver ipq806x_lpass_cpu_platform_driver = {
 	.driver	= {
 		.name		= "lpass-cpu",
-		.of_match_table	= of_match_ptr(ipq806x_lpass_cpu_device_id),
+		.of_match_table	= ipq806x_lpass_cpu_device_id,
 	},
 	.probe	= asoc_qcom_lpass_cpu_platform_probe,
 	.remove	= asoc_qcom_lpass_cpu_platform_remove,
diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c
index bc998d501600..3f4efd050a29 100644
--- a/sound/soc/qcom/lpass-sc7180.c
+++ b/sound/soc/qcom/lpass-sc7180.c
@@ -293,7 +293,7 @@ MODULE_DEVICE_TABLE(of, sc7180_lpass_cpu_device_id);
 static struct platform_driver sc7180_lpass_cpu_platform_driver = {
 	.driver = {
 		.name = "sc7180-lpass-cpu",
-		.of_match_table = of_match_ptr(sc7180_lpass_cpu_device_id),
+		.of_match_table = sc7180_lpass_cpu_device_id,
 	},
 	.probe = asoc_qcom_lpass_cpu_platform_probe,
 	.remove = asoc_qcom_lpass_cpu_platform_remove,
-- 
2.25.1