From: Alex Chiang <achiang@hp.com>
To: venkatesh.pallipadi@intel.com, lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 07/11] ACPI: processor: introduce acpi_processor_alloc_pdc()
Date: Sun, 20 Dec 2009 12:30:59 -0700 [thread overview]
Message-ID: <20091220193059.5545.23552.stgit@bob.kio> (raw)
In-Reply-To: <20091220192731.5545.20582.stgit@bob.kio>
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: Alex Chiang <achiang@hp.com>
---
drivers/acpi/processor_pdc.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
index e786e2c..23d2828 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);
}
next prev parent reply other threads:[~2009-12-20 19:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-20 19:30 [PATCH v2 00/11] ACPI: early _PDC eval and unify x86/ia64 Alex Chiang
2009-12-20 19:30 ` [PATCH v2 01/11] ACPI: processor: call _PDC early Alex Chiang
2009-12-21 1:34 ` Lin Ming
2009-12-21 2:19 ` Alex Chiang
2009-12-20 19:30 ` [PATCH v2 02/11] ACPI: processor: introduce arch_has_acpi_pdc Alex Chiang
2009-12-20 19:30 ` [PATCH v2 03/11] ACPI: processor: unify arch_acpi_processor_init_pdc Alex Chiang
2009-12-20 19:30 ` [PATCH v2 04/11] ACPI: processor: factor out common _PDC settings Alex Chiang
2009-12-20 19:30 ` [PATCH v2 05/11] ACPI: processor: finish unifying arch_acpi_processor_init_pdc() Alex Chiang
2009-12-20 19:30 ` [PATCH v2 06/11] ACPI: processor: unify arch_acpi_processor_cleanup_pdc Alex Chiang
2009-12-20 19:30 ` Alex Chiang [this message]
2009-12-20 19:31 ` [PATCH v2 08/11] ACPI: processor: change acpi_processor_eval_pdc interface Alex Chiang
2009-12-20 19:31 ` [PATCH v2 09/11] ACPI: processor: open code acpi_processor_cleanup_pdc Alex Chiang
2009-12-20 19:31 ` [PATCH v2 10/11] ACPI: processor: change acpi_processor_set_pdc() interface Alex Chiang
2009-12-20 19:31 ` [PATCH v2 11/11] ACPI: processor: remove _PDC object list from struct acpi_processor Alex Chiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091220193059.5545.23552.stgit@bob.kio \
--to=achiang@hp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=venkatesh.pallipadi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox