net: xgbe: remove extraneous #ifdef checks
authorArnd Bergmann <arnd@arndb.de>
Wed, 3 Apr 2024 08:06:46 +0000 (10:06 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 6 Apr 2024 05:11:28 +0000 (22:11 -0700)
When both ACPI and OF are disabled, xgbe_v1 is unused and
causes a W=1 warning:

drivers/net/ethernet/amd/xgbe/xgbe-platform.c:533:39: error: unused variable 'xgbe_v1' [-Werror,-Wunused-const-variable]
static const struct xgbe_version_data xgbe_v1 = {

There is no real point in trying to save a few bytes for the match
tables, so just make them always visible.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20240403080702.3509288-29-arnd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/amd/xgbe/xgbe-platform.c

index 9131020d06af14c8e55301dbab11af73ca53212a..7912b3b45148ab9933d09f24a245ec2e1954547c 100644 (file)
@@ -538,7 +538,6 @@ static const struct xgbe_version_data xgbe_v1 = {
        .tx_tstamp_workaround           = 1,
 };
 
-#ifdef CONFIG_ACPI
 static const struct acpi_device_id xgbe_acpi_match[] = {
        { .id = "AMDI8001",
          .driver_data = (kernel_ulong_t)&xgbe_v1 },
@@ -546,9 +545,7 @@ static const struct acpi_device_id xgbe_acpi_match[] = {
 };
 
 MODULE_DEVICE_TABLE(acpi, xgbe_acpi_match);
-#endif
 
-#ifdef CONFIG_OF
 static const struct of_device_id xgbe_of_match[] = {
        { .compatible = "amd,xgbe-seattle-v1a",
          .data = &xgbe_v1 },
@@ -556,7 +553,6 @@ static const struct of_device_id xgbe_of_match[] = {
 };
 
 MODULE_DEVICE_TABLE(of, xgbe_of_match);
-#endif
 
 static SIMPLE_DEV_PM_OPS(xgbe_platform_pm_ops,
                         xgbe_platform_suspend, xgbe_platform_resume);
@@ -564,12 +560,8 @@ static SIMPLE_DEV_PM_OPS(xgbe_platform_pm_ops,
 static struct platform_driver xgbe_driver = {
        .driver = {
                .name = XGBE_DRV_NAME,
-#ifdef CONFIG_ACPI
                .acpi_match_table = xgbe_acpi_match,
-#endif
-#ifdef CONFIG_OF
                .of_match_table = xgbe_of_match,
-#endif
                .pm = &xgbe_platform_pm_ops,
        },
        .probe = xgbe_platform_probe,