From: Hanjun Guo <hanjun.guo@linaro.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, linux-acpi@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Sudeep Holla <Sudeep.Holla@arm.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org,
Hanjun Guo <hanjun.guo@linaro.org>
Subject: [PATCH v3 5/7] ACPI / processor: remove phys_id in acpi_processor_get_info()
Date: Mon, 11 May 2015 12:17:17 +0800 [thread overview]
Message-ID: <1431317839-4584-6-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1431317839-4584-1-git-send-email-hanjun.guo@linaro.org>
Use pr->phys_id to replace phys_id to simplify the code.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
drivers/acpi/acpi_processor.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index 0676b50..62c846b 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -215,7 +215,6 @@ static int acpi_processor_get_info(struct acpi_device *device)
union acpi_object object = { 0 };
struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
struct acpi_processor *pr = acpi_driver_data(device);
- phys_cpuid_t phys_id;
int device_declaration = 0;
acpi_status status = AE_OK;
static int cpu0_initialized;
@@ -263,10 +262,10 @@ static int acpi_processor_get_info(struct acpi_device *device)
pr->acpi_id = value;
}
- phys_id = acpi_get_phys_id(pr->handle, device_declaration, pr->acpi_id);
- if (phys_id == PHYS_CPUID_INVALID)
+ pr->phys_id = acpi_get_phys_id(pr->handle, device_declaration,
+ pr->acpi_id);
+ if (pr->phys_id == PHYS_CPUID_INVALID)
acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n");
- pr->phys_id = phys_id;
pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id);
if (!cpu0_initialized && !acpi_has_cpu_in_madt()) {
--
1.9.1
next prev parent reply other threads:[~2015-05-11 4:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 4:17 [PATCH v3 0/7] minor cleanups for ACPI processor driver Hanjun Guo
2015-05-11 4:17 ` [PATCH v3 1/7] ACPI / processor: Introduce invalid_logical_cpuid() Hanjun Guo
2015-05-11 4:17 ` [PATCH v3 2/7] Xen / ACPI / processor: use invalid_logical_cpuid() Hanjun Guo
2015-05-11 13:57 ` Konrad Rzeszutek Wilk
2015-05-11 4:17 ` [PATCH v3 3/7] Xen / ACPI / processor: Remove unneeded NULL check Hanjun Guo
2015-05-11 13:58 ` Konrad Rzeszutek Wilk
2015-05-11 4:17 ` [PATCH v3 4/7] ACPI / processor: remove cpu_index in acpi_processor_get_info() Hanjun Guo
2015-05-11 4:17 ` Hanjun Guo [this message]
2015-05-11 4:17 ` [PATCH v3 6/7] ACPI / processor: return specific error instead of -1 Hanjun Guo
2015-05-11 4:17 ` [PATCH v3 7/7] ACPI / processor: Introduce invalid_phys_cpuid() Hanjun Guo
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=1431317839-4584-6-git-send-email-hanjun.guo@linaro.org \
--to=hanjun.guo@linaro.org \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=boris.ostrovsky@oracle.com \
--cc=catalin.marinas@arm.com \
--cc=konrad.wilk@oracle.com \
--cc=linaro-acpi@lists.linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=stefano.stabellini@eu.citrix.com \
--cc=will.deacon@arm.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