diff options
| author | Gavin Shan <gshan@redhat.com> | 2020-09-22 15:04:16 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-09-28 22:52:22 +0200 |
| commit | bc110fd322816c9684603a55404b51228c0feca8 (patch) | |
| tree | 9bfe916f2aedb269fe9c61394f6a8f9be6b7dadf | |
| parent | firmware: arm_sdei: Unregister driver on error in sdei_init() (diff) | |
| download | linux-bc110fd322816c9684603a55404b51228c0feca8.tar.xz linux-bc110fd322816c9684603a55404b51228c0feca8.zip | |
firmware: arm_sdei: Remove duplicate check in sdei_get_conduit()
The following two checks are duplicate because @acpi_disabled doesn't
depend on CONFIG_ACPI. So the duplicate check (IS_ENABLED(CONFIG_ACPI))
can be dropped. More details is provided to keep the commit log complete:
* @acpi_disabled is defined in arch/arm64/kernel/acpi.c when
CONFIG_ACPI is enabled.
* @acpi_disabled in defined in include/acpi.h when CONFIG_ACPI
is disabled.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: James Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20200922130423.10173-7-gshan@redhat.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | drivers/firmware/arm_sdei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index e7e9059c395b..5daa4e20595c 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -958,7 +958,7 @@ static int sdei_get_conduit(struct platform_device *pdev) } pr_warn("invalid \"method\" property: %s\n", method); - } else if (IS_ENABLED(CONFIG_ACPI) && !acpi_disabled) { + } else if (!acpi_disabled) { if (acpi_psci_use_hvc()) { sdei_firmware_call = &sdei_smccc_hvc; return SMCCC_CONDUIT_HVC; |