Pull acpi_os_free into release branch
authorLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:19:08 +0000 (17:19 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:19:08 +0000 (17:19 -0400)
19 files changed:
arch/ia64/kernel/acpi-ext.c
arch/ia64/kernel/acpi.c
drivers/acpi/acpi_memhotplug.c
drivers/acpi/asus_acpi.c
drivers/acpi/battery.c
drivers/acpi/container.c
drivers/acpi/glue.c
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/osl.c
drivers/acpi/processor_idle.c
drivers/acpi/processor_perflib.c
drivers/acpi/scan.c
drivers/acpi/system.c
drivers/acpi/utilities/utalloc.c
drivers/acpi/utilities/utcache.c
drivers/acpi/utils.c
drivers/acpi/video.c
include/acpi/acmacros.h
include/acpi/acpiosxf.h

index 2a1ef742e2239a3ea9ad7054c09a6be33c203fc9..b7515bc808a8d815708c45124661e94cc4d63286 100644 (file)
@@ -50,7 +50,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)
        memcpy(length, vendor->byte_data + 8, sizeof(*length));
 
   exit:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
 }
 
index ccdef199d91553078fd5ceb5d65abc9042eb1f57..99761b81db4496a78c0ea1eb0cb1076c438c8c3c 100644 (file)
@@ -856,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
        obj = buffer.pointer;
        if (obj->type != ACPI_TYPE_BUFFER ||
            obj->buffer.length < sizeof(*lsapic)) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return -EINVAL;
        }
 
@@ -864,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 
        if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
            (!lsapic->flags.enabled)) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return -EINVAL;
        }
 
        physid = ((lsapic->id << 8) | (lsapic->eid));
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        buffer.length = ACPI_ALLOCATE_BUFFER;
        buffer.pointer = NULL;
 
@@ -934,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
        obj = buffer.pointer;
        if (obj->type != ACPI_TYPE_BUFFER ||
            obj->buffer.length < sizeof(*iosapic)) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return AE_OK;
        }
 
        iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer;
 
        if (iosapic->header.type != ACPI_MADT_IOSAPIC) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return AE_OK;
        }
 
        gsi_base = iosapic->global_irq_base;
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        /*
         * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell
index cd57372a672942cffc5b7cfb74731ac3682494c2..84a68965c11ad38e475445cf1f318cc09ab05f15 100644 (file)
@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle)
 
        info = buffer.pointer;
        if (!(info->valid & ACPI_VALID_HID)) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return AE_ERROR;
        }
 
@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle)
            (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
                status = AE_ERROR;
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
 }
 
index 055cfd5c8766c3f217ee943e282557e7c3e7effb..eb0b8fb837c60786ca0ed46382fc60719e6d927b 100644 (file)
@@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void)
                }
                hotk->methods = &model_conf[hotk->model];
                
-               acpi_os_free(model);
+               kfree(model);
 
                return AE_OK;
        }
@@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void)
                /* S1300A reports L84F, but L1400B too, account for that */
        }
 
-       acpi_os_free(model);
+       kfree(model);
 
        return AE_OK;
 }
@@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void)
        acpi_bus_unregister_driver(&asus_hotk_driver);
        remove_proc_entry(PROC_ASUS, acpi_root_dir);
 
-       acpi_os_free(asus_info);
+       kfree(asus_info);
 
        return;
 }
index 00b0728efe820a28ece8497b4fb3e819c566b5d8..7d92f73b265f6e98d0d4c0d9e705dbbc9040f15a 100644 (file)
@@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        if (!result)
                (*bif) = (struct acpi_battery_info *)data.pointer;
@@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        if (!result)
                (*bst) = (struct acpi_battery_status *)data.pointer;
index 7f7e41d40a3b77da042d6d414f3393ad13977968..871aa520ece78aaa50d94bbb90a29c3c9f4ef83b 100644 (file)
@@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle,
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return AE_OK;
 }
index 8daef57b994c4b264db47d4a050243812f5a0b8b..10f160dc75b1cb5370063bcf96a6c738745d028c 100644 (file)
@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle)
                bbn = bus;
        }
       exit:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return (int)bbn;
 }
 
@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
                find->handle = handle;
        status = AE_OK;
       exit:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
 }
 
@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
                info = buffer.pointer;
                if (info->address == find->address)
                        find->handle = handle;
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
        }
        return AE_OK;
 }
@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev)
 
                acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer);
                DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
        } else
                DBG("Device %s -> No ACPI support\n", dev->bus_id);
 #endif
index 6d9bd45af30a6c95b997978d6d6d02e68b0fcc3c..dca6799ac678a978df124150cee591c832f5c5c4 100644 (file)
@@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
                /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
 
-               acpi_os_free(return_buffer->pointer);
+               ACPI_FREE(return_buffer->pointer);
                return_buffer->pointer = NULL;
        }
 
index 5dd2ed11a38755a57dd27685fa783549bcfa5d80..d4bd314d60baab5d02cac35612d78c5970411a26 100644 (file)
@@ -146,13 +146,6 @@ void *acpi_os_allocate(acpi_size size)
                return kmalloc(size, GFP_KERNEL);
 }
 
-void acpi_os_free(void *ptr)
-{
-       kfree(ptr);
-}
-
-EXPORT_SYMBOL(acpi_os_free);
-
 acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
 {
        if (efi_enabled) {
@@ -742,7 +735,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
 
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));
 
-       acpi_os_free(sem);
+       kfree(sem);
        sem = NULL;
 
        return AE_OK;
index e439eb77d283e98f011de2707dfbef70f75545a4..8e9c26aae8fed13b69875c211612c7d2cb01b820 100644 (file)
@@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                status = -EFAULT;
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return status;
 }
index 14a00e5a8f6a14f002413d16369c46c99571257d..7ba5e49ab302c523848930773d474c351fed30a1 100644 (file)
@@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
               sizeof(struct acpi_pct_register));
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return result;
 }
@@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return result;
 }
@@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor     *pr)
        }
 
 end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return result;
 }
 
index 861ac378ce42c34eeddb2125e52682c9960bf0f0..5fcb50c7b77802d135cbbe1368f96e8fabd6877e 100644 (file)
@@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
                goto end;
        }
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        device->wakeup.flags.valid = 1;
        /* Power button, Lid switch always enable wakeup */
@@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,
                        printk(KERN_ERR "Memory allocation error\n");
        }
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 }
 
 static int acpi_device_set_context(struct acpi_device *device, int type)
index c90bd2f70b3fa0b9df9297ec5293f21533fd2351..c3bb7faad75ee59e613c2d93bf2280051c64b344 100644 (file)
@@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file,
 
        res = simple_read_from_buffer(buffer, count, ppos,
                                      dsdt.pointer, dsdt.length);
-       acpi_os_free(dsdt.pointer);
+       kfree(dsdt.pointer);
 
        return res;
 }
@@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file,
 
        res = simple_read_from_buffer(buffer, count, ppos,
                                      fadt.pointer, fadt.length);
-       acpi_os_free(fadt.pointer);
+       kfree(fadt.pointer);
 
        return res;
 }
index 7940fc1bd69ef88a1900ea903647f26531c49264..5cff17dc78b331855b143ebffa7d95b749dcab68 100644 (file)
@@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void)
 
        /* Free memory lists */
 
-       acpi_os_free(acpi_gbl_global_list);
+       ACPI_FREE(acpi_gbl_global_list);
        acpi_gbl_global_list = NULL;
 
-       acpi_os_free(acpi_gbl_ns_node_list);
+       ACPI_FREE(acpi_gbl_ns_node_list);
        acpi_gbl_ns_node_list = NULL;
 #endif
 
index 56270a30718ae8b968430a527a20efc3b4087676..1a1f8109159cec3d9d988d1513a75cdb1638ecf4 100644 (file)
@@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
 
        /* Now we can delete the cache object */
 
-       acpi_os_free(cache);
+       ACPI_FREE(cache);
        return (AE_OK);
 }
 
index 1930e1a75b22589838d46b8cb66779f131d0a069..f48227f4c8c9183f03e224852af6fa2f1c14c129 100644 (file)
@@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle,
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return AE_OK;
 }
@@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle,
                //kfree(list->handles);
        }
 
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        return status;
 }
index 9feb633087a9b5f0e56cbd089c80f41a7f2e6095..1f3ffb353299422848367fa028c69087c777c1a3 100644 (file)
@@ -1450,7 +1450,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
        video->attached_array = active_device_list;
        video->attached_count = count;
       out:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
 }
 
index 4bb38068f40dc0ebc1238d6e2c093d7cd7f1f3fb..f1ac6109556e8d69fa53d3157bfbff877dbafb37 100644 (file)
 
 #define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__)
 #define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__)
-#define ACPI_FREE(a)                acpi_os_free(a)
+#define ACPI_FREE(a)                kfree(a)
 #define ACPI_MEM_TRACKING(a)
 
 #else
index 89bc4a16c2e89d8741669e93e4ee185b231f262c..0cd63bce0ae423d1905d37448879df7c802d79ac 100644 (file)
@@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle);
  */
 void *acpi_os_allocate(acpi_size size);
 
-void acpi_os_free(void *memory);
-
 acpi_status
 acpi_os_map_memory(acpi_physical_address physical_address,
                   acpi_size size, void __iomem ** logical_address);