diff options
| author | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2021-04-06 10:57:54 +0300 |
|---|---|---|
| committer | Patrice Chotard <patrice.chotard@foss.st.com> | 2021-04-09 12:53:00 +0300 |
| commit | 2214d5e54c3cd55ba1d83f18985bbcb0a9dabe1a (patch) | |
| tree | ce50fdf428d67edd5dae8bd8b7616782af96c488 /board/st | |
| parent | cbea7b3e7e7d951997392ebd62c4637de5916978 (diff) | |
| download | u-boot-2214d5e54c3cd55ba1d83f18985bbcb0a9dabe1a.tar.xz | |
stm32mp1: remove the board_check_usb_power function when ADC is not activated
Simplify the code of the function board_check_usb_power
based in CONFIG_ADC and adc_measurement; the function is removed by the
linker when the CONFIG_ADC is not activated.
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Diffstat (limited to 'board/st')
| -rw-r--r-- | board/st/stm32mp1/stm32mp1.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 759181fb5d..261ec15e1b 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -347,6 +347,9 @@ static int board_check_usb_power(void) u32 nb_blink; u8 i; + if (!IS_ENABLED(CONFIG_ADC)) + return -ENODEV; + node = ofnode_path("/config"); if (!ofnode_valid(node)) { log_debug("no /config node?\n"); @@ -370,11 +373,7 @@ static int board_check_usb_power(void) /* perform maximum of 2 ADC measurements to detect power supply current */ for (i = 0; i < 2; i++) { - if (IS_ENABLED(CONFIG_ADC)) - ret = adc_measurement(node, adc_count, &min_uV, &max_uV); - else - ret = -ENODEV; - + ret = adc_measurement(node, adc_count, &min_uV, &max_uV); if (ret) return ret; |