ACPI: Clean up memory allocations
authorjhbird.choi@samsung.com <jhbird.choi@samsung.com>
Thu, 20 Mar 2014 07:35:56 +0000 (16:35 +0900)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Apr 2014 14:23:33 +0000 (16:23 +0200)
Use acpi_os_allocate_zeroed instead of acpi_os_allocate + memset.

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/osl.c
drivers/acpi/utils.c

index f7fd72ac69cf52839e6bd92a9f503fc8e7c66dad..6776c599816f33100a2403ae7286e534f0a96354 100644 (file)
@@ -1219,10 +1219,9 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
 {
        struct semaphore *sem = NULL;
 
-       sem = acpi_os_allocate(sizeof(struct semaphore));
+       sem = acpi_os_allocate_zeroed(sizeof(struct semaphore));
        if (!sem)
                return AE_NO_MEMORY;
-       memset(sem, 0, sizeof(struct semaphore));
 
        sema_init(sem, initial_units);
 
index 0f5f78fa6545cf4d30da8f56b426033ac7f7132e..bba526148583c4ea67e0a5d08631d7f0eecbee2a 100644 (file)
@@ -164,11 +164,10 @@ acpi_extract_package(union acpi_object *package,
         * Validate output buffer.
         */
        if (buffer->length == ACPI_ALLOCATE_BUFFER) {
-               buffer->pointer = ACPI_ALLOCATE(size_required);
+               buffer->pointer = ACPI_ALLOCATE_ZEROED(size_required);
                if (!buffer->pointer)
                        return AE_NO_MEMORY;
                buffer->length = size_required;
-               memset(buffer->pointer, 0, size_required);
        } else {
                if (buffer->length < size_required) {
                        buffer->length = size_required;