Skip to content

Commit bc110fd

Browse files
Gavin Shanwilldeacon
authored andcommitted
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>
1 parent 63627ca commit bc110fd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/firmware/arm_sdei.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ static int sdei_get_conduit(struct platform_device *pdev)
958958
}
959959

960960
pr_warn("invalid \"method\" property: %s\n", method);
961-
} else if (IS_ENABLED(CONFIG_ACPI) && !acpi_disabled) {
961+
} else if (!acpi_disabled) {
962962
if (acpi_psci_use_hvc()) {
963963
sdei_firmware_call = &sdei_smccc_hvc;
964964
return SMCCC_CONDUIT_HVC;

0 commit comments

Comments
 (0)