From: Gavin Shan <gshan@redhat.com>
To: linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, will@kernel.org, james.morse@arm.com,
shan.gavin@gmail.com, catalin.marinas@arm.com
Subject: [PATCH 05/14] drivers/firmware/sdei: Remove sdei_get_conduit()
Date: Mon, 6 Jul 2020 15:47:23 +1000 [thread overview]
Message-ID: <20200706054732.99387-6-gshan@redhat.com> (raw)
In-Reply-To: <20200706054732.99387-1-gshan@redhat.com>
There are some logics in sdei_get_conduit() can be safely dropped:
* There are no associated device node with the platform device,
so it's pointless to check on it.
* ACPI functionality has been verified when the platform device
is added in sdei_init(). So it's unnecessary to recheck.
With above logics dropped, sdei_get_conduit() is quite simple and
it's not worthy to maintain a separate function. The logic is merged
to sdei_probe() as it's the only caller.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
drivers/firmware/arm_sdei.c | 40 +++----------------------------------
1 file changed, 3 insertions(+), 37 deletions(-)
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 7e7b26b1f91b..ca0e3f5eb907 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -933,49 +933,15 @@ int sdei_unregister_ghes(struct ghes *ghes)
return err;
}
-static int sdei_get_conduit(struct platform_device *pdev)
-{
- const char *method;
- struct device_node *np = pdev->dev.of_node;
-
- sdei_firmware_call = NULL;
- if (np) {
- if (of_property_read_string(np, "method", &method)) {
- pr_warn("missing \"method\" property\n");
- return SMCCC_CONDUIT_NONE;
- }
-
- if (!strcmp("hvc", method)) {
- sdei_firmware_call = &sdei_smccc_hvc;
- return SMCCC_CONDUIT_HVC;
- } else if (!strcmp("smc", method)) {
- sdei_firmware_call = &sdei_smccc_smc;
- return SMCCC_CONDUIT_SMC;
- }
-
- pr_warn("invalid \"method\" property: %s\n", method);
- } else if (IS_ENABLED(CONFIG_ACPI) && !acpi_disabled) {
- if (acpi_psci_use_hvc()) {
- sdei_firmware_call = &sdei_smccc_hvc;
- return SMCCC_CONDUIT_HVC;
- } else {
- sdei_firmware_call = &sdei_smccc_smc;
- return SMCCC_CONDUIT_SMC;
- }
- }
-
- return SMCCC_CONDUIT_NONE;
-}
-
static int sdei_probe(struct platform_device *pdev)
{
int err;
u64 ver = 0;
int conduit;
- conduit = sdei_get_conduit(pdev);
- if (!sdei_firmware_call)
- return 0;
+ conduit = acpi_psci_use_hvc() ? SMCCC_CONDUIT_HVC : SMCCC_CONDUIT_SMC;
+ sdei_firmware_call = acpi_psci_use_hvc() ?
+ &sdei_smccc_hvc : &sdei_smccc_smc;
err = sdei_api_get_version(&ver);
if (err == -EOPNOTSUPP)
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-06 5:49 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 5:47 [PATCH 00/14] Refactor SDEI client driver Gavin Shan
2020-07-06 5:47 ` [PATCH 01/14] drivers/firmware/sdei: Remove sdei_is_err() Gavin Shan
2020-07-21 20:39 ` James Morse
2020-07-22 2:04 ` Gavin Shan
2020-07-06 5:47 ` [PATCH 02/14] drivers/firmware/sdei: Common block for failing path in sdei_event_create() Gavin Shan
2020-07-21 20:40 ` James Morse
2020-07-22 2:12 ` Gavin Shan
2020-07-06 5:47 ` [PATCH 03/14] drivers/firmware/sdei: Dereference SDEI event parameter directly Gavin Shan
2020-07-21 20:41 ` James Morse
2020-07-22 2:38 ` Gavin Shan
2020-07-06 5:47 ` [PATCH 04/14] drivers/firmware/sdei: Rework sdei_init() Gavin Shan
2020-07-21 20:42 ` James Morse
2020-07-22 3:34 ` Gavin Shan
2020-07-06 5:47 ` Gavin Shan [this message]
2020-07-21 20:42 ` [PATCH 05/14] drivers/firmware/sdei: Remove sdei_get_conduit() James Morse
2020-07-22 3:50 ` Gavin Shan
2020-07-06 5:47 ` [PATCH 06/14] drivers/firmware/sdei: Drop redundant error message in sdei_probe() Gavin Shan
2020-07-06 5:47 ` [PATCH 07/14] drivers/firmware/sdei: Drop unnecessary while loop Gavin Shan
2020-07-06 5:47 ` [PATCH 08/14] drivers/firmware/sdei: Cleanup on cross call functions Gavin Shan
2020-07-06 5:47 ` [PATCH 09/14] drivers/firmware/sdei: Introduce sdei_do_local_call() Gavin Shan
2020-07-06 5:47 ` [PATCH 10/14] drivers/firmware/sdei: Remove _sdei_event_register() Gavin Shan
2020-07-06 5:47 ` [PATCH 11/14] drivers/firmware/sdei: Remove _sdei_event_unregister() Gavin Shan
2020-07-06 5:47 ` [PATCH 12/14] drivers/firmware/sdei: Identify event by struct sdei_event Gavin Shan
2020-07-06 5:47 ` [PATCH 13/14] drivers/firmware/sdei: Retrieve event signaled property on creation Gavin Shan
2020-07-06 5:47 ` [PATCH 14/14] drivers/firmware/sdei: Add sdei_event_get_info() Gavin Shan
2020-07-21 9:44 ` [PATCH 00/14] Refactor SDEI client driver Gavin Shan
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=20200706054732.99387-6-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.org \
/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.