From nobody Sun Sep 22 02:01:08 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFCF3C433EF for ; Mon, 9 May 2022 12:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234130AbiEIMQc (ORCPT ); Mon, 9 May 2022 08:16:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234071AbiEIMQ3 (ORCPT ); Mon, 9 May 2022 08:16:29 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF7041D5718 for ; Mon, 9 May 2022 05:12:33 -0700 (PDT) Received: from canpemm500007.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Kxg2v3PrQzGpj4; Mon, 9 May 2022 20:09:43 +0800 (CST) Received: from localhost (10.174.179.215) by canpemm500007.china.huawei.com (7.192.104.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 9 May 2022 20:12:30 +0800 From: YueHaibing To: , , , , , , , , CC: , , , , YueHaibing Subject: [PATCH v3 -next] ASoC: mediatek: mt8195: Fix build warning without CONFIG_OF Date: Mon, 9 May 2022 20:09:18 +0800 Message-ID: <20220509120918.9000-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.179.215] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500007.china.huawei.com (7.192.104.62) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sound/soc/mediatek/mt8195/mt8195-mt6359.c:1639:32: warning: =E2=80=98mt8195= _mt6359_max98390_rt5682_card=E2=80=99 defined but not used [-Wunused-variab= le] 1639 | static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = =3D { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1634:32: warning: =E2=80=98mt8195= _mt6359_rt1011_rt5682_card=E2=80=99 defined but not used [-Wunused-variable] 1634 | static struct mt8195_card_data mt8195_mt6359_rt1011_rt5682_card =3D= { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1629:32: warning: =E2=80=98mt8195= _mt6359_rt1019_rt5682_card=E2=80=99 defined but not used [-Wunused-variable] 1629 | static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card =3D= { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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 max98= 390 and rt5682") Signed-off-by: YueHaibing Acked-by: Arnd Bergmann --- v3: rebase on next-20220509 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 3e32fe801b3c..54a00b0699b1 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1641,7 +1641,6 @@ static struct mt8195_card_data mt8195_mt6359_max98390= _rt5682_card =3D { .quirk =3D MAX98390_SPEAKER_AMP_PRESENT, }; =20 -#ifdef CONFIG_OF static const struct of_device_id mt8195_mt6359_dt_match[] =3D { { .compatible =3D "mediatek,mt8195_mt6359_rt1019_rt5682", @@ -1657,7 +1656,6 @@ static const struct of_device_id mt8195_mt6359_dt_mat= ch[] =3D { }, {}, }; -#endif =20 static const struct dev_pm_ops mt8195_mt6359_pm_ops =3D { .poweroff =3D snd_soc_poweroff, @@ -1667,9 +1665,7 @@ static const struct dev_pm_ops mt8195_mt6359_pm_ops = =3D { static struct platform_driver mt8195_mt6359_driver =3D { .driver =3D { .name =3D "mt8195_mt6359", -#ifdef CONFIG_OF .of_match_table =3D mt8195_mt6359_dt_match, -#endif .pm =3D &mt8195_mt6359_pm_ops, }, .probe =3D mt8195_mt6359_dev_probe, --=20 2.17.1