[PATCH v2 -next] ASoC: mediatek: mt8195: Fix build warning without CONFIG_OF

From: YueHaibing
Date: Fri May 06 2022 - 22:14:47 EST


sound/soc/mediatek/mt8195/mt8195-mt6359.c:1639:32: warning: ‘mt8195_mt6359_max98390_rt5682_card’ defined but not used [-Wunused-variable]
1639 | static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/mediatek/mt8195/mt8195-mt6359.c:1634:32: warning: ‘mt8195_mt6359_rt1011_rt5682_card’ defined but not used [-Wunused-variable]
1634 | static struct mt8195_card_data mt8195_mt6359_rt1011_rt5682_card = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/mediatek/mt8195/mt8195-mt6359.c:1629:32: warning: ‘mt8195_mt6359_rt1019_rt5682_card’ defined but not used [-Wunused-variable]
1629 | static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card = {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Since all users of this driver do need CONFIG_OF anyway, there is no
need to save a few bytes on kernel builds while CONFIG_OF disabled, so
just remove the #ifdef to fix this warning.

Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682")
Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
---
v2: remove #ifdef block as Arnd suggested
---
sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
index f90675f14d60..54a00b0699b1 100644
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -1626,7 +1626,6 @@ static int mt8195_mt6359_dev_probe(struct platform_device *pdev)
return ret;
}

-#ifdef CONFIG_OF
static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card = {
.name = "mt8195_r1019_5682",
.quirk = RT1019_SPEAKER_AMP_PRESENT,
@@ -1657,7 +1656,6 @@ static const struct of_device_id mt8195_mt6359_dt_match[] = {
},
{},
};
-#endif

static const struct dev_pm_ops mt8195_mt6359_pm_ops = {
.poweroff = snd_soc_poweroff,
@@ -1667,9 +1665,7 @@ static const struct dev_pm_ops mt8195_mt6359_pm_ops = {
static struct platform_driver mt8195_mt6359_driver = {
.driver = {
.name = "mt8195_mt6359",
-#ifdef CONFIG_OF
.of_match_table = mt8195_mt6359_dt_match,
-#endif
.pm = &mt8195_mt6359_pm_ops,
},
.probe = mt8195_mt6359_dev_probe,
--
2.17.1