summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/processor_pdc.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index e786e2ce1882..23d2828157e0 100644
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@ -54,26 +54,24 @@ static void acpi_set_pdc_bits(u32 *buf)
arch_acpi_set_pdc_bits(buf);
}
-static void acpi_processor_init_pdc(struct acpi_processor *pr)
+static struct acpi_object_list *acpi_processor_alloc_pdc(void)
{
struct acpi_object_list *obj_list;
union acpi_object *obj;
u32 *buf;
- pr->pdc = NULL;
-
/* allocate and initialize pdc. It will be used later. */
obj_list = kmalloc(sizeof(struct acpi_object_list), GFP_KERNEL);
if (!obj_list) {
printk(KERN_ERR "Memory allocation error\n");
- return;
+ return NULL;
}
obj = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
if (!obj) {
printk(KERN_ERR "Memory allocation error\n");
kfree(obj_list);
- return;
+ return NULL;
}
buf = kmalloc(12, GFP_KERNEL);
@@ -81,7 +79,7 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
printk(KERN_ERR "Memory allocation error\n");
kfree(obj);
kfree(obj_list);
- return;
+ return NULL;
}
acpi_set_pdc_bits(buf);
@@ -91,9 +89,8 @@ static void acpi_processor_init_pdc(struct acpi_processor *pr)
obj->buffer.pointer = (u8 *) buf;
obj_list->count = 1;
obj_list->pointer = obj;
- pr->pdc = obj_list;
- return;
+ return obj_list;
}
/*
@@ -142,10 +139,17 @@ static void acpi_processor_cleanup_pdc(struct acpi_processor *pr)
void acpi_processor_set_pdc(struct acpi_processor *pr)
{
+ struct acpi_object_list *obj_list;
+
if (arch_has_acpi_pdc() == false)
return;
- acpi_processor_init_pdc(pr);
+ obj_list = acpi_processor_alloc_pdc();
+ if (!obj_list)
+ return;
+
+ pr->pdc = obj_list;
+
acpi_processor_eval_pdc(pr);
acpi_processor_cleanup_pdc(pr);
}
OpenPOWER on IntegriCloud