[PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code

[Stefan Roese]

Hi Pali,

On 3/4/23 11:41, Pali Rohár wrote:
> Show correct information in debug() output and use correct names for variables.
> 
> No functional change.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> ---
>   arch/arm/mach-mvebu/cpu.c | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index 97154aaa2a7e..018a3614d4dd 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -67,6 +67,8 @@ u32 get_boot_device(void)
>   {
>   	u32 val;
>   	u32 boot_device;
> +	u32 boot_err_mode;
> +	u32 boot_err_code;
>   
>   	/*
>   	 * First check, if UART boot-mode is active. This can only
> @@ -74,9 +76,9 @@ u32 get_boot_device(void)
>   	 * MSB marks if the UART mode is active.
>   	 */
>   	val = readl(BOOTROM_ERR_REG);
> -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
> -	if (boot_device == BOOTROM_ERR_MODE_UART)
> +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
> +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
>   		return BOOT_DEVICE_UART;
>   
>   #ifdef CONFIG_ARMADA_38X
> @@ -84,8 +86,9 @@ u32 get_boot_device(void)
>   	 * If the bootrom error code contains any other than zeros it's an
>   	 * error condition and the bootROM has fallen back to UART boot
>   	 */
> -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> -	if (boot_device)
> +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> +	debug("boot_err_code=0x%x\n", boot_err_code);
> +	if (boot_err_code)
>   		return BOOT_DEVICE_UART;
>   #endif
>   

This leads to the following compile warnings, e.g. for maxbcm_defconfig:

[stefan at zen4 u-boot-marvell (next)]$ make -sj
arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 
'boot_err_code' [-Wunused-variable]
    71 |         u32 boot_err_code;
       |             ^~~~~~~~~~~~~
arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 
'boot_err_code' [-Wunused-variable]
    71 |         u32 boot_err_code;
       |             ^~~~~~~~~~~~~

Could you please take a look?

Thanks,
Stefan