[PATCH 12/38] ASoC: uniphier: drop of_match_ptr from of_device_id table

Krzysztof Kozlowski krzk at kernel.org
Fri Nov 20 17:16:26 CET 2020


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/uniphier/aio-ld11.c:375:34: warning: ‘uniphier_aio_of_match’ defined but not used [-Wunused-const-variable=]
  sound/soc/uniphier/evea.c:554:34: warning: ‘evea_of_match’ defined but not used [-Wunused-const-variable=]

Signed-off-by: Krzysztof Kozlowski <krzk at kernel.org>
---
 sound/soc/uniphier/aio-ld11.c | 2 +-
 sound/soc/uniphier/aio-pxs2.c | 2 +-
 sound/soc/uniphier/evea.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/uniphier/aio-ld11.c b/sound/soc/uniphier/aio-ld11.c
index 8b44f8dc4970..107dd8c15a0a 100644
--- a/sound/soc/uniphier/aio-ld11.c
+++ b/sound/soc/uniphier/aio-ld11.c
@@ -388,7 +388,7 @@ MODULE_DEVICE_TABLE(of, uniphier_aio_of_match);
 static struct platform_driver uniphier_aio_driver = {
 	.driver = {
 		.name = "snd-uniphier-aio-ld11",
-		.of_match_table = of_match_ptr(uniphier_aio_of_match),
+		.of_match_table = uniphier_aio_of_match,
 	},
 	.probe    = uniphier_aio_probe,
 	.remove   = uniphier_aio_remove,
diff --git a/sound/soc/uniphier/aio-pxs2.c b/sound/soc/uniphier/aio-pxs2.c
index a1d05fe9d3c2..66e983d80c5e 100644
--- a/sound/soc/uniphier/aio-pxs2.c
+++ b/sound/soc/uniphier/aio-pxs2.c
@@ -294,7 +294,7 @@ MODULE_DEVICE_TABLE(of, uniphier_aio_of_match);
 static struct platform_driver uniphier_aio_driver = {
 	.driver = {
 		.name = "snd-uniphier-aio-pxs2",
-		.of_match_table = of_match_ptr(uniphier_aio_of_match),
+		.of_match_table = uniphier_aio_of_match,
 	},
 	.probe    = uniphier_aio_probe,
 	.remove   = uniphier_aio_remove,
diff --git a/sound/soc/uniphier/evea.c b/sound/soc/uniphier/evea.c
index d27e9ca07856..b14d52052439 100644
--- a/sound/soc/uniphier/evea.c
+++ b/sound/soc/uniphier/evea.c
@@ -560,7 +560,7 @@ MODULE_DEVICE_TABLE(of, evea_of_match);
 static struct platform_driver evea_codec_driver = {
 	.driver = {
 		.name = DRV_NAME,
-		.of_match_table = of_match_ptr(evea_of_match),
+		.of_match_table = evea_of_match,
 	},
 	.probe  = evea_probe,
 	.remove = evea_remove,
-- 
2.25.1



More information about the Alsa-devel mailing list