From 0a6cf23ce7898a6bf831e23336a09483419e6e95 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 19 Apr 2021 00:33:31 +0200 Subject: [PATCH] soc/intel/cannonlake: Remove unnecessary function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parse_devicetree() just calls parse_devicetree_param(). To be aligned with other platforms, remove it and rename parse_devicetree_param() to parse_devicetree(). Change-Id: I1128ab709cfdb02bbdb505c3f22f5433a30cb3c1 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/52488 Reviewed-by: Angel Pons Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/fsp_params.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index 9d1d55fea5..57fb8c1a9d 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -59,7 +59,7 @@ static uint8_t get_param_value(const config_t *config, uint32_t dev_offset) } #if CONFIG(SOC_INTEL_COMETLAKE) -static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params) +static void parse_devicetree(const config_t *config, FSP_S_CONFIG *params) { uint32_t dev_offset = 0; uint32_t i = 0; @@ -81,20 +81,13 @@ static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params) } } #else -static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params) +static void parse_devicetree(const config_t *config, FSP_S_CONFIG *params) { for (int i = 0; i < ARRAY_SIZE(serial_io_dev); i++) params->SerialIoDevMode[i] = get_param_value(config, i); } #endif -static void parse_devicetree(FSP_S_CONFIG *params) -{ - const config_t *config = config_of_soc(); - - parse_devicetree_param(config, params); -} - /* Ignore LTR value for GBE devices */ static void ignore_gbe_ltr(void) { @@ -139,7 +132,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) config_t *config = config_of_soc(); /* Parse device tree and enable/disable devices */ - parse_devicetree(params); + parse_devicetree(config, params); /* Load VBT before devicetree-specific config. */ params->GraphicsConfigPtr = (uintptr_t)vbt_get();