[PATCH next v2 5/6] rockchip: remove unused global data ptr

[Kever Yang]

On 2023/11/9 01:25, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> Remove leftover import and global data ptr from files since they aren't
> used anymore.
>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/board.c         | 3 ---
>   arch/arm/mach-rockchip/rk3128/rk3128.c | 3 ---
>   arch/arm/mach-rockchip/rk3308/rk3308.c | 3 ---
>   arch/arm/mach-rockchip/rk3328/rk3328.c | 3 ---
>   arch/arm/mach-rockchip/rk3368/rk3368.c | 3 ---
>   arch/arm/mach-rockchip/rk3399/rk3399.c | 3 ---
>   arch/arm/mach-rockchip/rk3588/rk3588.c | 2 --
>   7 files changed, 20 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
> index 57f08e0be0e..6a9d297e6ff 100644
> --- a/arch/arm/mach-rockchip/board.c
> +++ b/arch/arm/mach-rockchip/board.c
> @@ -16,7 +16,6 @@
>   #include <syscon.h>
>   #include <uuid.h>
>   #include <asm/cache.h>
> -#include <asm/global_data.h>
>   #include <asm/io.h>
>   #include <asm/arch-rockchip/boot_mode.h>
>   #include <asm/arch-rockchip/clock.h>
> @@ -24,8 +23,6 @@
>   #include <asm/arch-rockchip/misc.h>
>   #include <power/regulator.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #if defined(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && defined(CONFIG_EFI_PARTITION)
>   
>   #define DFU_ALT_BUF_LEN			SZ_1K
> diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
> index 01dbfa75cb2..8f8f4951bae 100644
> --- a/arch/arm/mach-rockchip/rk3128/rk3128.c
> +++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
> @@ -4,9 +4,6 @@
>    */
>   #include <common.h>
>   #include <init.h>
> -#include <asm/global_data.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
>   
>   int arch_cpu_init(void)
>   {
> diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
> index 5763604dc3e..6f121bf1304 100644
> --- a/arch/arm/mach-rockchip/rk3308/rk3308.c
> +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
> @@ -5,7 +5,6 @@
>   #include <common.h>
>   #include <init.h>
>   #include <malloc.h>
> -#include <asm/global_data.h>
>   #include <asm/io.h>
>   #include <asm/arch/grf_rk3308.h>
>   #include <asm/arch-rockchip/bootrom.h>
> @@ -14,8 +13,6 @@
>   #include <debug_uart.h>
>   #include <linux/bitops.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #include <asm/armv8/mmu.h>
>   static struct mm_region rk3308_mem_map[] = {
>   	{
> diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
> index de17b886827..02821c9e51d 100644
> --- a/arch/arm/mach-rockchip/rk3328/rk3328.c
> +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
> @@ -10,11 +10,8 @@
>   #include <asm/arch-rockchip/grf_rk3328.h>
>   #include <asm/arch-rockchip/uart.h>
>   #include <asm/armv8/mmu.h>
> -#include <asm/global_data.h>
>   #include <asm/io.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #define CRU_BASE		0xFF440000
>   #define GRF_BASE		0xFF100000
>   #define UART2_BASE		0xFF130000
> diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
> index d0a6107e5e0..d009b8758e5 100644
> --- a/arch/arm/mach-rockchip/rk3368/rk3368.c
> +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
> @@ -8,7 +8,6 @@
>   #include <init.h>
>   #include <syscon.h>
>   #include <asm/armv8/mmu.h>
> -#include <asm/global_data.h>
>   #include <asm/io.h>
>   #include <asm/arch-rockchip/bootrom.h>
>   #include <asm/arch-rockchip/clock.h>
> @@ -18,8 +17,6 @@
>   #include <linux/bitops.h>
>   #include <linux/delay.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #define IMEM_BASE                  0xFF8C0000
>   
>   /* Max MCU's SRAM value is 8K, begin at (IMEM_BASE + 4K) */
> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
> index 6929de5603c..a13855f5ee2 100644
> --- a/arch/arm/mach-rockchip/rk3399/rk3399.c
> +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
> @@ -11,7 +11,6 @@
>   #include <spl_gpio.h>
>   #include <syscon.h>
>   #include <asm/armv8/mmu.h>
> -#include <asm/global_data.h>
>   #include <asm/io.h>
>   #include <asm/arch-rockchip/bootrom.h>
>   #include <asm/arch-rockchip/clock.h>
> @@ -23,8 +22,6 @@
>   #include <linux/printk.h>
>   #include <power/regulator.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #define GRF_EMMCCORE_CON11 0xff77f02c
>   #define GRF_BASE	0xff770000
>   
> diff --git a/arch/arm/mach-rockchip/rk3588/rk3588.c b/arch/arm/mach-rockchip/rk3588/rk3588.c
> index fde5f281b0a..093b2d1ba88 100644
> --- a/arch/arm/mach-rockchip/rk3588/rk3588.c
> +++ b/arch/arm/mach-rockchip/rk3588/rk3588.c
> @@ -12,8 +12,6 @@
>   #include <asm/arch-rockchip/hardware.h>
>   #include <asm/arch-rockchip/ioc_rk3588.h>
>   
> -DECLARE_GLOBAL_DATA_PTR;
> -
>   #define FIREWALL_DDR_BASE		0xfe030000
>   #define FW_DDR_MST5_REG			0x54
>   #define FW_DDR_MST13_REG		0x74
>