From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Date: Fri, 9 Apr 2021 07:10:21 +0900 Subject: [PATCH] stm32mp1: remove the board_check_usb_power function when ADC is not activated In-Reply-To: <20210406095752.1.I339c57936517e4941007cc421c1e2cad5a08a0d3@changeid> References: <20210406095752.1.I339c57936517e4941007cc421c1e2cad5a08a0d3@changeid> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 4/6/21 4:57 PM, Patrick Delaunay wrote: > 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 Reviewed-by: Jaehoon Chung Best Regards, Jaehoon Chung > --- > > board/st/stm32mp1/stm32mp1.c | 9 ++++----- > 1 file 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; > >