Merge ../linus

[linux-drm-fsl-dcu.git] / drivers / acpi / motherboard.c

diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index d51d68f5dd8ddd66ab21e2ef5d082adaf5d7fff0..2e17ec75af03e84756689ce8bca915f2b0e3c2d5 100644 (file)
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -48,17 +48,22 @@ ACPI_MODULE_NAME("acpi_motherboard")
  * the io ports if they really know they can use it, while
  * still preventing hotplug PCI devices from using it.
  */
+
+/*
+ * When CONFIG_PNP is enabled, pnp/system.c binds to PNP0C01
+ * and PNP0C02, redundant with acpi_reserve_io_ranges().
+ * But acpi_reserve_io_ranges() is necessary for !CONFIG_PNP.
+ */
 static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
 {
        struct resource *requested_res = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_reserve_io_ranges");
 
        if (res->type == ACPI_RESOURCE_TYPE_IO) {
                struct acpi_resource_io *io_res = &res->data.io;
 
                if (io_res->minimum != io_res->maximum)
-                       return_VALUE(AE_OK);
+                       return AE_OK;
                if (IS_RESERVED_ADDR
                    (io_res->minimum, io_res->address_length)) {
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -92,7 +97,7 @@ static acpi_status acpi_reserve_io_ranges(struct acpi_resource *res, void *data)
 
        if (requested_res)
                requested_res->flags &= ~IORESOURCE_BUSY;
-       return_VALUE(AE_OK);
+       return AE_OK;
 }
 
 static int acpi_motherboard_add(struct acpi_device *device)