From patchwork Wed Apr 3 08:06:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13615345 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F5E8CD1288 for ; Wed, 3 Apr 2024 08:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=U1IPx2SVuefFRhy3d9PiXG3Q3csa54TarnHEdujLO7Y=; b=0xhRKnlW26V2pe 6wdGdsubcP8nZHXkHE+m1jpDtCE2XDlA7EEYNrUTWUM6mJxPYMW+yVcO0Hrh2U3LFg+SaK5NhMl7v E9UEVFQ4yolCJPiR/2AWu1U4PafD/Ouv2I4TZSjVQCrMfB6HmVbTNMVkfYB4EB7igSCwOZsYZltZ8 bGVTDRy4wjATOr2tLnV+PghT3LYAk9BOKisoDK2tx5v07/BaLpI5Oiy+RkMzr4wh3JY5J/dg0QsYt 3ZcO7hHcwfFgAMzYerV+NPOdqUYkk7aLHv7Vgc4Xah0nQlq3eY7dhAgF/wrxDgOmZkQDu4fDu25/S WU6LKW3cVm4i4i1ZddVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrvkR-0000000EnaK-08O7; Wed, 03 Apr 2024 08:13:31 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrvkP-0000000EnYs-1Koa for linux-arm-kernel@bombadil.infradead.org; Wed, 03 Apr 2024 08:13:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=u2oUjJRBOeVSrzX5fXnVOWXj89nN2vlLyF18jbLinB0=; b=rS3f+qvWL3Xi4EY5DrMCyyEfwE L1GgdNPin6qVw9f400zkPc4OA0ooXKH0DR4KgB/dL2Q6S5AAh1ayGnMl/YVtsxl/oN+eRWfuD1FgS HLwfV/XaLkmPPO6ReYRqaFC5VMsXA0/NDNIvgWCpGVBwBIHIiRP/gcIB6fzJLi4KbacCXmQmLk7sV /JVZaXMIQ3wWvqvKmXu5wXfDuCWh5tTZjhBzeaDOVBF+If3ZRZ7CWyCTIaimaHPURXX4p6rdfh2yI pufcBsLmNaAv2JxFLgTBi+qw6SsFj9c++tfMirEm5vSGtJhbmSZ0GRDZPc4N99GgD9H38ZOAEN3M0 O/M83e1g==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrvkK-000000045oT-13sa for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 08:13:26 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D0D4260C0B; Wed, 3 Apr 2024 08:13:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95395C433C7; Wed, 3 Apr 2024 08:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712132000; bh=cHRmsqunH9hP/qtXbd35N4JkMuQoGtu0x3hJ4tAgdrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mL4FfJyzLl9gsq+QwjOIrerxmGhTo6GDqw+UdiO+FN1TNPbQ1HU4hUHSq50YrgXyO hXHcEM4a1AfR/UMk2OlDEdOtkZ7hLM16HAr75p42zC3E/fZmTMFFvDziVxgFQIRCfO 0qPx53oM278y1D0ZnnomrHkf/8qt46zlW41rrmspumuSLR/CwOXBD8PAekA0tR4SV5 n6RyEQgcFzrrp4y18VqL/jxAFRC0t2QR05D1FAIqEsfiAca752UIyw7Aktq+IPx3TC n1oRUic3ZgN8V1orOq8yfxAiWatGMFmTrfPdsjirFu3CT0SmC51Inan5tHzb3m4Wdy OZORH7MZL3gMw== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Claudiu Beznea , Nicolas Ferre , Alexandre Belloni , Oder Chiou , Srinivas Kandagatla , Banajit Goswami , Sylwester Nawrocki Cc: Arnd Bergmann , Alper Nebi Yasak , Kuninori Morimoto , Akihiko Odaki , Linus Walleij , Yinchuan Guo , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , AngeloGioacchino Del Regno , Krzysztof Kozlowski , linux-sound@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 32/34] ASoC: remove incorrect of_match_ptr/ACPI_PTR annotations Date: Wed, 3 Apr 2024 10:06:50 +0200 Message-Id: <20240403080702.3509288-33-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240403080702.3509288-1-arnd@kernel.org> References: <20240403080702.3509288-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_091325_073419_4500CCA1 X-CRM114-Status: GOOD ( 16.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann When building with CONFIG_OF and/or CONFIG_ACPI disabled but W=1 extra warnings enabled, a lot of driver cause a warning about an unused ID table: sound/soc/atmel/sam9x5_wm8731.c:187:34: error: unused variable 'sam9x5_wm8731_of_match' [-Werror,-Wunused-const-variable] sound/soc/codecs/rt5514-spi.c:496:34: error: unused variable 'rt5514_of_match' [-Werror,-Wunused-const-variable] sound/soc/samsung/aries_wm8994.c:524:34: error: unused variable 'samsung_wm8994_of_match' [-Werror,-Wunused-const-variable] The fix is always to just remove the of_match_ptr() and ACPI_PTR() wrappers that remove the reference, rather than adding another #ifdef just for build testing for a configuration that doesn't matter in practice. Signed-off-by: Arnd Bergmann Reviewed-by: Andy Shevchenko --- sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- sound/soc/atmel/sam9x5_wm8731.c | 2 +- sound/soc/codecs/rt5514-spi.c | 2 +- sound/soc/qcom/lpass-sc7280.c | 2 +- sound/soc/samsung/aries_wm8994.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index d6cdb6d9fdd6..ffc105759994 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -543,7 +543,7 @@ MODULE_DEVICE_TABLE(acpi, acp3x_audio_acpi_match); static struct platform_driver acp3x_audio = { .driver = { .name = "acp3x-alc5682-max98357", - .acpi_match_table = ACPI_PTR(acp3x_audio_acpi_match), + .acpi_match_table = acp3x_audio_acpi_match, .pm = &snd_soc_pm_ops, }, .probe = acp3x_probe, diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index d1c1f370a9cd..95c8c37478a3 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -193,7 +193,7 @@ MODULE_DEVICE_TABLE(of, sam9x5_wm8731_of_match); static struct platform_driver sam9x5_wm8731_driver = { .driver = { .name = DRV_NAME, - .of_match_table = of_match_ptr(sam9x5_wm8731_of_match), + .of_match_table = sam9x5_wm8731_of_match, }, .probe = sam9x5_wm8731_driver_probe, .remove_new = sam9x5_wm8731_driver_remove, diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index f475c8cfadae..da397db8d7d5 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -503,7 +503,7 @@ static struct spi_driver rt5514_spi_driver = { .driver = { .name = "rt5514", .pm = &rt5514_pm_ops, - .of_match_table = of_match_ptr(rt5514_of_match), + .of_match_table = rt5514_of_match, }, .probe = rt5514_spi_probe, }; diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c index 47c622327a8d..c91620128fd4 100644 --- a/sound/soc/qcom/lpass-sc7280.c +++ b/sound/soc/qcom/lpass-sc7280.c @@ -441,7 +441,7 @@ MODULE_DEVICE_TABLE(of, sc7280_lpass_cpu_device_id); static struct platform_driver sc7280_lpass_cpu_platform_driver = { .driver = { .name = "sc7280-lpass-cpu", - .of_match_table = of_match_ptr(sc7280_lpass_cpu_device_id), + .of_match_table = sc7280_lpass_cpu_device_id, .pm = &sc7280_lpass_pm_ops, }, .probe = asoc_qcom_lpass_cpu_platform_probe, diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c index a548ac33dd94..9f7318c4ee33 100644 --- a/sound/soc/samsung/aries_wm8994.c +++ b/sound/soc/samsung/aries_wm8994.c @@ -689,7 +689,7 @@ static int aries_audio_probe(struct platform_device *pdev) static struct platform_driver aries_audio_driver = { .driver = { .name = "aries-audio-wm8994", - .of_match_table = of_match_ptr(samsung_wm8994_of_match), + .of_match_table = samsung_wm8994_of_match, .pm = &snd_soc_pm_ops, }, .probe = aries_audio_probe,