]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gpio: xgene-sb: Drop ACPI_PTR() and CONFIG_ACPI guards
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 18 Oct 2024 13:45:01 +0000 (16:45 +0300)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 22 Oct 2024 07:21:12 +0000 (09:21 +0200)
The complexity of config guards needed for ACPI_PTR() is not worthwhile
for the small amount of saved data. This example was doing it correctly
but I am proposing dropping this so as to reduce chance of cut and paste
where it is done wrong.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20241018134550.2071101-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-xgene-sb.c

index ae592528001d681223aa580f95ac492740dd41cb..64184d4bd894c7b5fd9c1def057c7899e4ea195f 100644 (file)
@@ -304,20 +304,18 @@ static const struct of_device_id xgene_gpio_sb_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, xgene_gpio_sb_of_match);
 
-#ifdef CONFIG_ACPI
 static const struct acpi_device_id xgene_gpio_sb_acpi_match[] = {
        {"APMC0D15", 0},
        {},
 };
 MODULE_DEVICE_TABLE(acpi, xgene_gpio_sb_acpi_match);
-#endif
 
 static struct platform_driver xgene_gpio_sb_driver = {
        .driver = {
                   .name = "xgene-gpio-sb",
                   .of_match_table = xgene_gpio_sb_of_match,
-                  .acpi_match_table = ACPI_PTR(xgene_gpio_sb_acpi_match),
-                  },
+                  .acpi_match_table = xgene_gpio_sb_acpi_match,
+       },
        .probe = xgene_gpio_sb_probe,
        .remove = xgene_gpio_sb_remove,
 };