| Message ID | 20220506022638.15864-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [-next] ASoC: mediatek: mt8195: Fix build warning without CONFIG_OF | expand |
On Fri, May 6, 2022 at 4:26 AM YueHaibing <yuehaibing@huawei.com> wrote: > > 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 = { > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > These variables is only used with CONFIG_OF, move it into the ifdef block. > > Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> It's generally better to remove the #ifdef rather than expanding it, there is no need to save a few bytes on kernel builds of this driver that disable CONFIG_OF. Just drop the of_match_ptr() macro as well. Arnd
On 2022/5/6 15:08, Arnd Bergmann wrote: > On Fri, May 6, 2022 at 4:26 AM YueHaibing <yuehaibing@huawei.com> wrote: >> >> 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 = { >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> >> These variables is only used with CONFIG_OF, move it into the ifdef block. >> >> Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682") >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > It's generally better to remove the #ifdef rather than expanding it, > there is no need to > save a few bytes on kernel builds of this driver that disable > CONFIG_OF. Just drop > the of_match_ptr() macro as well. Sure, will do that in v2. > > > Arnd > > . >
diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 3e32fe801b3c..f90675f14d60 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1626,6 +1626,7 @@ 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, @@ -1641,7 +1642,6 @@ static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = { .quirk = MAX98390_SPEAKER_AMP_PRESENT, }; -#ifdef CONFIG_OF static const struct of_device_id mt8195_mt6359_dt_match[] = { { .compatible = "mediatek,mt8195_mt6359_rt1019_rt5682",
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 = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ These variables is only used with CONFIG_OF, move it into the ifdef block. Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)