From 4c333a6b4607db65b93020a892c5e770fbb65828 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 2 Nov 2022 19:01:34 +0100 Subject: soc/intel/**/fast_spi.c: Reorganize some statements Avoid calling `acpi_device_scope()` and `fast_spi_acpi_hid()` if the result won't be used. Also, reorder a condition so that compile-time constants appear first, so as to help the compiler optimize it out. Change-Id: I42ce55c2978ad9c593c359c5decd5842fb3a97a1 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/69168 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- src/soc/intel/common/block/fast_spi/fast_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c index 74449df746..53826447c6 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi.c +++ b/src/soc/intel/common/block/fast_spi/fast_spi.c @@ -502,17 +502,17 @@ static const char *fast_spi_acpi_name(const struct device *dev) */ static void fast_spi_fill_ssdt(const struct device *dev) { + /* Do not add SSDT if the fast SPI device is hidden. */ + if (!CONFIG(FAST_SPI_GENERATE_SSDT) || dev->hidden) + return; + const char *scope = acpi_device_scope(dev); const char *hid = fast_spi_acpi_hid(dev); - struct resource *res; - /* Do not add SSDT if the fast SPI device is hidden. */ - if (dev->hidden || !CONFIG(FAST_SPI_GENERATE_SSDT)) - return; if (!scope || !hid) return; - res = probe_resource(dev, PCI_BASE_ADDRESS_0); + struct resource *res = probe_resource(dev, PCI_BASE_ADDRESS_0); if (!res) return; -- cgit v1.2.3