[PATCH v2 03/34] ARM: rename __arm_mem_scratch to arm_mem_scratch

[Ahmad Fatoum]

On 17.05.23 11:03, Sascha Hauer wrote:
> There are different arm_mem_* macros/functions and only one of them
> has leading underscores. Remove them for consistency.
> 
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

> ---
>  arch/arm/include/asm/barebox-arm.h | 4 ++--
>  arch/arm/mach-imx/atf.c            | 6 +++---
>  arch/arm/mach-imx/xload-common.c   | 2 +-
>  include/mach/rockchip/bootrom.h    | 2 +-
>  4 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
> index 3a0c3d7d40..f446044be6 100644
> --- a/arch/arm/include/asm/barebox-arm.h
> +++ b/arch/arm/include/asm/barebox-arm.h
> @@ -71,11 +71,11 @@ static inline void arm_fixup_vectors(void)
>  
>  void *barebox_arm_boot_dtb(void);
>  
> -#define __arm_mem_scratch(endmem) ((endmem) - SZ_32K)
> +#define arm_mem_scratch(endmem) ((endmem) - SZ_32K)
>  
>  static inline const void *arm_mem_scratch_get(void)
>  {
> -	return (const void *)__arm_mem_scratch(arm_mem_endmem_get());
> +	return (const void *)arm_mem_scratch(arm_mem_endmem_get());
>  }
>  
>  #define arm_mem_stack_top(endmem) ((endmem) - SZ_64K - OPTEE_SIZE)
> diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c
> index 92820d9392..c5e6817aad 100644
> --- a/arch/arm/mach-imx/atf.c
> +++ b/arch/arm/mach-imx/atf.c
> @@ -137,7 +137,7 @@ __noreturn void imx8mm_load_and_start_image_via_tfa(void)
>  	void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
>  		imx8m_barebox_earlymem_size(32);
>  
> -	imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
> +	imx8m_save_bootrom_log(arm_mem_scratch(endmem));
>  	imx8mm_load_bl33(bl33);
>  
>  	if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MM_OPTEE))
> @@ -185,7 +185,7 @@ __noreturn void imx8mp_load_and_start_image_via_tfa(void)
>  	void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
>  		imx8m_barebox_earlymem_size(32);
>  
> -	imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
> +	imx8m_save_bootrom_log(arm_mem_scratch(endmem));
>  	imx8mp_load_bl33(bl33);
>  
>  	if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MP_OPTEE))
> @@ -234,7 +234,7 @@ __noreturn void imx8mn_load_and_start_image_via_tfa(void)
>  	void *endmem = (void *)MX8M_DDR_CSD1_BASE_ADDR +
>  		imx8m_barebox_earlymem_size(16);
>  
> -	imx8m_save_bootrom_log(__arm_mem_scratch(endmem));
> +	imx8m_save_bootrom_log(arm_mem_scratch(endmem));
>  	imx8mn_load_bl33(bl33);
>  
>  	if (IS_ENABLED(CONFIG_FIRMWARE_IMX8MN_OPTEE))
> diff --git a/arch/arm/mach-imx/xload-common.c b/arch/arm/mach-imx/xload-common.c
> index 0d3e6be1b1..03eb2ef109 100644
> --- a/arch/arm/mach-imx/xload-common.c
> +++ b/arch/arm/mach-imx/xload-common.c
> @@ -26,7 +26,7 @@ struct imx_scratch_space *__imx8m_scratch_space(int ddr_buswidth)
>  	ulong endmem = MX8M_DDR_CSD1_BASE_ADDR +
>  		imx8m_barebox_earlymem_size(ddr_buswidth);
>  
> -	return (void *)__arm_mem_scratch(endmem);
> +	return (void *)arm_mem_scratch(endmem);
>  }
>  
>  #define HDR_SIZE	512
> diff --git a/include/mach/rockchip/bootrom.h b/include/mach/rockchip/bootrom.h
> index 96eb147ae4..5b999fc606 100644
> --- a/include/mach/rockchip/bootrom.h
> +++ b/include/mach/rockchip/bootrom.h
> @@ -15,7 +15,7 @@ static inline void rockchip_store_bootrom_iram(ulong membase,
>                                                 ulong memsize,
>                                                 const void *iram)
>  {
> -	void *dst = (void *)__arm_mem_scratch(membase + memsize);
> +	void *dst = (void *)arm_mem_scratch(membase + memsize);
>  	memcpy(dst, iram, sizeof(struct rockchip_scratch_space));
>  }
>  

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |