aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_processor.c
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-09-02 20:32:09 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-23 19:37:56 -0400
commit6ebb5bc9e61be4315202c15a0f53f636e8f0bf2e (patch)
tree8deb5fddff2695698292dd55e0a4bf27b004f14c /drivers/acpi/acpi_processor.c
parent0e77e2c416e8fa110fa0e749db0ae1e9344b6050 (diff)
acpi_processor: convert acpi_evaluate_object() to acpi_evaluate_integer()
acpi_evaluate_integer() is an ACPI API introduced to evaluate an ACPI control method that is known to have an integer return value. This API can simplify the code because the calling function does not need to use the specified acpi_buffer structure required by acpi_evaluate_object(); Convert acpi_evaluate_object() to acpi_evaluate_integer() in drivers/acpi/acpi_processor.c in this patch. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_processor.c')
-rw-r--r--drivers/acpi/acpi_processor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index f29e06efa479..357abdc1406a 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -219,6 +219,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
219 int cpu_index, device_declaration = 0; 219 int cpu_index, device_declaration = 0;
220 acpi_status status = AE_OK; 220 acpi_status status = AE_OK;
221 static int cpu0_initialized; 221 static int cpu0_initialized;
222 unsigned long long value;
222 223
223 if (num_online_cpus() > 1) 224 if (num_online_cpus() > 1)
224 errata.smp = TRUE; 225 errata.smp = TRUE;
@@ -258,7 +259,6 @@ static int acpi_processor_get_info(struct acpi_device *device)
258 * Declared with "Device" statement; match _UID. 259 * Declared with "Device" statement; match _UID.
259 * Note that we don't handle string _UIDs yet. 260 * Note that we don't handle string _UIDs yet.
260 */ 261 */
261 unsigned long long value;
262 status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID, 262 status = acpi_evaluate_integer(pr->handle, METHOD_NAME__UID,
263 NULL, &value); 263 NULL, &value);
264 if (ACPI_FAILURE(status)) { 264 if (ACPI_FAILURE(status)) {
@@ -332,9 +332,9 @@ static int acpi_processor_get_info(struct acpi_device *device)
332 * ensure we get the right value in the "physical id" field 332 * ensure we get the right value in the "physical id" field
333 * of /proc/cpuinfo 333 * of /proc/cpuinfo
334 */ 334 */
335 status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer); 335 status = acpi_evaluate_integer(pr->handle, "_SUN", NULL, &value);
336 if (ACPI_SUCCESS(status)) 336 if (ACPI_SUCCESS(status))
337 arch_fix_phys_package_id(pr->id, object.integer.value); 337 arch_fix_phys_package_id(pr->id, value);
338 338
339 return 0; 339 return 0;
340} 340}