]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: xgene-v2: remove incorrect ACPI_PTR annotation
authorArnd Bergmann <arnd@arndb.de>
Tue, 25 Feb 2025 16:33:33 +0000 (17:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:13:05 +0000 (11:13 +0200)
[ Upstream commit 01358e8fe922f716c05d7864ac2213b2440026e7 ]

Building with W=1 shows a warning about xge_acpi_match being unused when
CONFIG_ACPI is disabled:

drivers/net/ethernet/apm/xgene-v2/main.c:723:36: error: unused variable 'xge_acpi_match' [-Werror,-Wunused-const-variable]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20250225163341.4168238-2-arnd@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/apm/xgene-v2/main.c

index 2a91c84aebdb04792dad5e988126b52c7c6bd5bd..d7ca847d44c7cca4787cb5e439f538978ddaa8dc 100644 (file)
@@ -9,8 +9,6 @@
 
 #include "main.h"
 
-static const struct acpi_device_id xge_acpi_match[];
-
 static int xge_get_resources(struct xge_pdata *pdata)
 {
        struct platform_device *pdev;
@@ -731,7 +729,7 @@ MODULE_DEVICE_TABLE(acpi, xge_acpi_match);
 static struct platform_driver xge_driver = {
        .driver = {
                   .name = "xgene-enet-v2",
-                  .acpi_match_table = ACPI_PTR(xge_acpi_match),
+                  .acpi_match_table = xge_acpi_match,
        },
        .probe = xge_probe,
        .remove = xge_remove,