Skip to content

Commit 33319f6

Browse files
andy-shevBartosz Golaszewski
authored andcommitted
gpio: xgene-sb: Drop ACPI_PTR() and CONFIG_ACPI guards
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 8b26b8e commit 33319f6

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpio/gpio-xgene-sb.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,18 @@ static const struct of_device_id xgene_gpio_sb_of_match[] = {
304304
};
305305
MODULE_DEVICE_TABLE(of, xgene_gpio_sb_of_match);
306306

307-
#ifdef CONFIG_ACPI
308307
static const struct acpi_device_id xgene_gpio_sb_acpi_match[] = {
309308
{"APMC0D15", 0},
310309
{},
311310
};
312311
MODULE_DEVICE_TABLE(acpi, xgene_gpio_sb_acpi_match);
313-
#endif
314312

315313
static struct platform_driver xgene_gpio_sb_driver = {
316314
.driver = {
317315
.name = "xgene-gpio-sb",
318316
.of_match_table = xgene_gpio_sb_of_match,
319-
.acpi_match_table = ACPI_PTR(xgene_gpio_sb_acpi_match),
320-
},
317+
.acpi_match_table = xgene_gpio_sb_acpi_match,
318+
},
321319
.probe = xgene_gpio_sb_probe,
322320
.remove = xgene_gpio_sb_remove,
323321
};

0 commit comments

Comments
 (0)