Pull release into acpica branch
[pandora-kernel.git] / drivers / acpi / motherboard.c
index 2934475..85c1fb5 100644 (file)
 #include <acpi/acpi_drivers.h>
 
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
-ACPI_MODULE_NAME               ("acpi_motherboard")
+ACPI_MODULE_NAME("acpi_motherboard")
 
 /* Dell use PNP0C01 instead of PNP0C02 */
 #define ACPI_MB_HID1                   "PNP0C01"
 #define ACPI_MB_HID2                   "PNP0C02"
-
 /**
  * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved
  * Doesn't care about the failure of 'request_region', since other may reserve 
@@ -43,42 +42,49 @@ ACPI_MODULE_NAME            ("acpi_motherboard")
  */
 #define IS_RESERVED_ADDR(base, len) \
        (((len) > 0) && ((base) > 0) && ((base) + (len) < IO_SPACE_LIMIT) \
-       && ((base) + (len) > 0x1000))
-
+       && ((base) + (len) > PCIBIOS_MIN_IO))
 /*
  * Clearing the flag (IORESOURCE_BUSY) allows drivers to use
  * the io ports if they really know they can use it, while
  * still preventing hotplug PCI devices from using it. 
  */
-
-static acpi_status
-acpi_reserve_io_ranges (struct acpi_resource *res, void *data)
+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->id == ACPI_RSTYPE_IO) {
+       if (res->type == ACPI_RSTYPE_IO) {
                struct acpi_resource_io *io_res = &res->data.io;
 
                if (io_res->min_base_address != io_res->max_base_address)
                        return_VALUE(AE_OK);
-               if (IS_RESERVED_ADDR(io_res->min_base_address, io_res->range_length)) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Motherboard resources 0x%08x - 0x%08x\n",
-                               io_res->min_base_address, 
-                               io_res->min_base_address + io_res->range_length));
-                       requested_res = request_region(io_res->min_base_address, 
-                               io_res->range_length, "motherboard");
+               if (IS_RESERVED_ADDR
+                   (io_res->min_base_address, io_res->range_length)) {
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "Motherboard resources 0x%08x - 0x%08x\n",
+                                         io_res->min_base_address,
+                                         io_res->min_base_address +
+                                         io_res->range_length));
+                       requested_res =
+                           request_region(io_res->min_base_address,
+                                          io_res->range_length, "motherboard");
                }
-       } else if (res->id == ACPI_RSTYPE_FIXED_IO) {
-               struct acpi_resource_fixed_io *fixed_io_res = &res->data.fixed_io;
-
-               if (IS_RESERVED_ADDR(fixed_io_res->base_address, fixed_io_res->range_length)) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Motherboard resources 0x%08x - 0x%08x\n",
-                               fixed_io_res->base_address, 
-                               fixed_io_res->base_address + fixed_io_res->range_length));
-                       requested_res = request_region(fixed_io_res->base_address, 
-                               fixed_io_res->range_length, "motherboard");
+       } else if (res->type == ACPI_RSTYPE_FIXED_IO) {
+               struct acpi_resource_fixed_io *fixed_io_res =
+                   &res->data.fixed_io;
+
+               if (IS_RESERVED_ADDR
+                   (fixed_io_res->base_address, fixed_io_res->range_length)) {
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "Motherboard resources 0x%08x - 0x%08x\n",
+                                         fixed_io_res->base_address,
+                                         fixed_io_res->base_address +
+                                         fixed_io_res->range_length));
+                       requested_res =
+                           request_region(fixed_io_res->base_address,
+                                          fixed_io_res->range_length,
+                                          "motherboard");
                }
        } else {
                /* Memory mapped IO? */
@@ -89,72 +95,70 @@ acpi_reserve_io_ranges (struct acpi_resource *res, void *data)
        return_VALUE(AE_OK);
 }
 
-static int acpi_motherboard_add (struct acpi_device *device)
+static int acpi_motherboard_add(struct acpi_device *device)
 {
        if (!device)
                return -EINVAL;
-       acpi_walk_resources(device->handle, METHOD_NAME__CRS, 
-               acpi_reserve_io_ranges, NULL);
+       acpi_walk_resources(device->handle, METHOD_NAME__CRS,
+                           acpi_reserve_io_ranges, NULL);
 
        return 0;
 }
 
 static struct acpi_driver acpi_motherboard_driver1 = {
-       .name =         "motherboard",
-       .class =        "",
-       .ids =          ACPI_MB_HID1,
-       .ops =  {
-               .add =          acpi_motherboard_add,
-       },
+       .name = "motherboard",
+       .class = "",
+       .ids = ACPI_MB_HID1,
+       .ops = {
+               .add = acpi_motherboard_add,
+               },
 };
 
 static struct acpi_driver acpi_motherboard_driver2 = {
-       .name =         "motherboard",
-       .class =        "",
-       .ids =          ACPI_MB_HID2,
-       .ops =  {
-               .add =          acpi_motherboard_add,
-       },
+       .name = "motherboard",
+       .class = "",
+       .ids = ACPI_MB_HID2,
+       .ops = {
+               .add = acpi_motherboard_add,
+               },
 };
 
-static void __init
-acpi_reserve_resources (void)
+static void __init acpi_reserve_resources(void)
 {
        if (acpi_gbl_FADT->xpm1a_evt_blk.address && acpi_gbl_FADT->pm1_evt_len)
-               request_region(acpi_gbl_FADT->xpm1a_evt_blk.address, 
-                       acpi_gbl_FADT->pm1_evt_len, "PM1a_EVT_BLK");
+               request_region(acpi_gbl_FADT->xpm1a_evt_blk.address,
+                              acpi_gbl_FADT->pm1_evt_len, "PM1a_EVT_BLK");
 
        if (acpi_gbl_FADT->xpm1b_evt_blk.address && acpi_gbl_FADT->pm1_evt_len)
                request_region(acpi_gbl_FADT->xpm1b_evt_blk.address,
-                       acpi_gbl_FADT->pm1_evt_len, "PM1b_EVT_BLK");
+                              acpi_gbl_FADT->pm1_evt_len, "PM1b_EVT_BLK");
 
        if (acpi_gbl_FADT->xpm1a_cnt_blk.address && acpi_gbl_FADT->pm1_cnt_len)
-               request_region(acpi_gbl_FADT->xpm1a_cnt_blk.address, 
-                       acpi_gbl_FADT->pm1_cnt_len, "PM1a_CNT_BLK");
+               request_region(acpi_gbl_FADT->xpm1a_cnt_blk.address,
+                              acpi_gbl_FADT->pm1_cnt_len, "PM1a_CNT_BLK");
 
        if (acpi_gbl_FADT->xpm1b_cnt_blk.address && acpi_gbl_FADT->pm1_cnt_len)
-               request_region(acpi_gbl_FADT->xpm1b_cnt_blk.address, 
-                       acpi_gbl_FADT->pm1_cnt_len, "PM1b_CNT_BLK");
+               request_region(acpi_gbl_FADT->xpm1b_cnt_blk.address,
+                              acpi_gbl_FADT->pm1_cnt_len, "PM1b_CNT_BLK");
 
        if (acpi_gbl_FADT->xpm_tmr_blk.address && acpi_gbl_FADT->pm_tm_len == 4)
-               request_region(acpi_gbl_FADT->xpm_tmr_blk.address,
-                       4, "PM_TMR");
+               request_region(acpi_gbl_FADT->xpm_tmr_blk.address, 4, "PM_TMR");
 
        if (acpi_gbl_FADT->xpm2_cnt_blk.address && acpi_gbl_FADT->pm2_cnt_len)
                request_region(acpi_gbl_FADT->xpm2_cnt_blk.address,
-                       acpi_gbl_FADT->pm2_cnt_len, "PM2_CNT_BLK");
+                              acpi_gbl_FADT->pm2_cnt_len, "PM2_CNT_BLK");
 
        /* Length of GPE blocks must be a non-negative multiple of 2 */
 
        if (acpi_gbl_FADT->xgpe0_blk.address && acpi_gbl_FADT->gpe0_blk_len &&
-                       !(acpi_gbl_FADT->gpe0_blk_len & 0x1))
+           !(acpi_gbl_FADT->gpe0_blk_len & 0x1))
                request_region(acpi_gbl_FADT->xgpe0_blk.address,
-                       acpi_gbl_FADT->gpe0_blk_len, "GPE0_BLK");
+                              acpi_gbl_FADT->gpe0_blk_len, "GPE0_BLK");
 
        if (acpi_gbl_FADT->xgpe1_blk.address && acpi_gbl_FADT->gpe1_blk_len &&
-                       !(acpi_gbl_FADT->gpe1_blk_len & 0x1))
+           !(acpi_gbl_FADT->gpe1_blk_len & 0x1))
                request_region(acpi_gbl_FADT->xgpe1_blk.address,
-                       acpi_gbl_FADT->gpe1_blk_len, "GPE1_BLK");
+                              acpi_gbl_FADT->gpe1_blk_len, "GPE1_BLK");
 }
 
 static int __init acpi_motherboard_init(void)
@@ -166,7 +170,7 @@ static int __init acpi_motherboard_init(void)
         * This module must run after scan.c
         */
        if (!acpi_disabled)
-               acpi_reserve_resources ();
+               acpi_reserve_resources();
        return 0;
 }