Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b407aef authored by Alex Chiang's avatar Alex Chiang Committed by Len Brown
Browse files

ACPI: processor: introduce acpi_processor_alloc_pdc() 



acpi_processor_init_pdc() isn't really doing anything interesting
with the struct acpi_processor * parameter. Its real job is to allocate
the buffer for the _PDC bits.

So rename the function to acpi_processor_alloc_pdc(), and just return
the struct acpi_object_list * it's supposed to allocate.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 47817254

drivers/acpi/processor_pdc.c

+13 −9
Original line number Diff line number Diff line
@@ -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);

}