From: Alex Chiang <achiang@hp.com>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Subject: [PATCH v2 09/12] ACPI: processor: refactor internal map_x2apic_id()
Date: Mon, 22 Feb 2010 12:11:50 -0700 [thread overview]
Message-ID: <20100222191149.19752.78161.stgit@bob.kio> (raw)
In-Reply-To: <20100222190145.19752.20978.stgit@bob.kio>
Untangle the nested if conditions to make this function look
more similar to the other map_*apic_id() functions.
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
---
drivers/acpi/processor_core.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9eeda9e..18fa633 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -66,22 +66,16 @@ static int map_x2apic_id(struct acpi_subtable_header *entry,
{
struct acpi_madt_local_x2apic *apic =
(struct acpi_madt_local_x2apic *)entry;
- u32 tmp = apic->local_apic_id;
- /* Only check enabled APICs*/
if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
return 0;
- /* Device statement declaration type */
- if (device_declaration) {
- if (apic->uid == acpi_id)
- goto found;
+ if (device_declaration && (apic->uid == acpi_id)) {
+ *apic_id = apic->local_apic_id;
+ return 1;
}
return 0;
-found:
- *apic_id = tmp;
- return 1;
}
static int map_lsapic_id(struct acpi_subtable_header *entry,
next prev parent reply other threads:[~2010-02-22 19:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 19:11 [PATCH v2 00/12] ACPI: processor driver vs. core Alex Chiang
2010-02-22 19:11 ` [PATCH v2 01/12] ACPI: processor: mv processor_core.c processor_driver.c Alex Chiang
2010-02-22 19:11 ` [PATCH v2 02/12] ACPI: processor: mv processor_pdc.c processor_core.c Alex Chiang
2010-02-22 19:11 ` [PATCH v2 03/12] ACPI: processor: export acpi_get_cpuid() Alex Chiang
2010-02-22 19:11 ` [PATCH v2 04/12] ACPI: processor: move acpi_get_cpuid into processor_core.c Alex Chiang
2010-02-22 19:11 ` [PATCH v2 05/12] ACPI: processor: add internal processor_physically_present() Alex Chiang
2010-02-22 19:11 ` [PATCH v2 06/12] ACPI: processor: remove early _PDC optin quirks Alex Chiang
2010-02-22 19:11 ` [PATCH v2 07/12] ACPI: processor: driver doesn't need to evaluate _PDC Alex Chiang
2010-02-22 19:11 ` [PATCH v2 08/12] ACPI: processor: refactor internal map_lapic_id() Alex Chiang
2010-02-22 19:11 ` Alex Chiang [this message]
2010-02-22 19:11 ` [PATCH v2 10/12] ACPI: processor: refactor internal map_lsapic_id() Alex Chiang
2010-02-22 19:12 ` [PATCH v2 11/12] ACPI: processor: push file static MADT pointer into internal map_madt_entry() Alex Chiang
2010-02-22 19:12 ` [PATCH v2 12/12] ACPI: processor core: style and sparse cleanups 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=20100222191149.19752.78161.stgit@bob.kio \
--to=achiang@hp.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.