iio: adc: ti-adc109s102: drop ACPI_PTR() and CONFIG_ACPI guards
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 31 Dec 2023 18:35:14 +0000 (18:35 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 23 Jan 2024 22:06:56 +0000 (22:06 +0000)
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.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20231231183514.566609-25-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ti-adc108s102.c

index c82a161630e1d97d5e9073e811d437215c325a43..69fcbbc7e418a8022da249595932e332d85a2b14 100644 (file)
@@ -293,13 +293,11 @@ static const struct of_device_id adc108s102_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, adc108s102_of_match);
 
-#ifdef CONFIG_ACPI
 static const struct acpi_device_id adc108s102_acpi_ids[] = {
        { "INT3495", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, adc108s102_acpi_ids);
-#endif
 
 static const struct spi_device_id adc108s102_id[] = {
        { "adc108s102", 0 },
@@ -311,7 +309,7 @@ static struct spi_driver adc108s102_driver = {
        .driver = {
                .name   = "adc108s102",
                .of_match_table = adc108s102_of_match,
-               .acpi_match_table = ACPI_PTR(adc108s102_acpi_ids),
+               .acpi_match_table = adc108s102_acpi_ids,
        },
        .probe          = adc108s102_probe,
        .id_table       = adc108s102_id,