ACPI: docs: enumeration: Drop ugly ifdeffery from the examples

The ifdeffery around ACPI ID tables are ugly and in some cases
even less valuable than plain definitions. Drop them for good
to avoid spreading rather bad pattern.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/firmware-guide/acpi/enumeration.rst b/Documentation/firmware-guide/acpi/enumeration.rst
index 7a5095901153d8076500167b2cd275435214c2c1..caa9a5e508b2e3fff2fe073506d3830e43fe01d1 100644 (file)
--- a/Documentation/firmware-guide/acpi/enumeration.rst
+++ b/Documentation/firmware-guide/acpi/enumeration.rst
@@ -47,18 +47,16 @@ some minor changes.
 Adding ACPI support for an existing driver should be pretty
 straightforward. Here is the simplest example::
 
-       #ifdef CONFIG_ACPI
        static const struct acpi_device_id mydrv_acpi_match[] = {
                /* ACPI IDs here */
                { }
        };
        MODULE_DEVICE_TABLE(acpi, mydrv_acpi_match);
-       #endif
 
        static struct platform_driver my_driver = {
                ...
                .driver = {
-                       .acpi_match_table = ACPI_PTR(mydrv_acpi_match),
+                       .acpi_match_table = mydrv_acpi_match,
                },
        };
 
@@ -173,18 +171,16 @@ The SPI device drivers only need to add ACPI IDs in a similar way than with
 the platform device drivers. Below is an example where we add ACPI support
 to at25 SPI eeprom driver (this is meant for the above ACPI snippet)::
 
-       #ifdef CONFIG_ACPI
        static const struct acpi_device_id at25_acpi_match[] = {
                { "AT25", 0 },
                { },
        };
        MODULE_DEVICE_TABLE(acpi, at25_acpi_match);
-       #endif
 
        static struct spi_driver at25_driver = {
                .driver = {
                        ...
-                       .acpi_match_table = ACPI_PTR(at25_acpi_match),
+                       .acpi_match_table = at25_acpi_match,
                },
        };
 
@@ -232,20 +228,18 @@ registered.
 Below is an example of how to add ACPI support to the existing mpu3050
 input driver::
 
-       #ifdef CONFIG_ACPI
        static const struct acpi_device_id mpu3050_acpi_match[] = {
                { "MPU3050", 0 },
                { },
        };
        MODULE_DEVICE_TABLE(acpi, mpu3050_acpi_match);
-       #endif
 
        static struct i2c_driver mpu3050_i2c_driver = {
                .driver = {
                        .name   = "mpu3050",
                        .pm     = &mpu3050_pm,
                        .of_match_table = mpu3050_of_match,
-                       .acpi_match_table = ACPI_PTR(mpu3050_acpi_match),
+                       .acpi_match_table = mpu3050_acpi_match,
                },
                .probe          = mpu3050_probe,
                .remove         = mpu3050_remove,