From ee50bb2a84dce324422f8bfa92c7e07da0b8bdf9 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Tue, 21 Mar 2023 19:45:35 +0900 Subject: [PATCH] amlogic: dmc: Remove __init section macro for code used from probe Data and function used by probe function should not be in __init section. Remove __init and __initdata macros for code called from probe. Change-Id: Ibf0d06e6d5751a342db3531e83a186c83812963a Signed-off-by: Seung-Woo Kim --- drivers/amlogic/ddr_tool/ddr_port_desc.c | 30 +++++++++++++++--------------- drivers/amlogic/ddr_tool/dmc_monitor.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/amlogic/ddr_tool/ddr_port_desc.c b/drivers/amlogic/ddr_tool/ddr_port_desc.c index b18b6a1..d276bb6 100644 --- a/drivers/amlogic/ddr_tool/ddr_port_desc.c +++ b/drivers/amlogic/ddr_tool/ddr_port_desc.c @@ -50,7 +50,7 @@ * | | | ... | | * emmc ge2d usb audio spicc */ -static struct ddr_port_desc ddr_port_desc_m8b[] __initdata = { +static struct ddr_port_desc ddr_port_desc_m8b[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -78,7 +78,7 @@ static struct ddr_port_desc ddr_port_desc_m8b[] __initdata = { { .port_id = 45, .port_name = "ETHERNET" } }; -static struct ddr_port_desc ddr_port_desc_gxbb[] __initdata = { +static struct ddr_port_desc ddr_port_desc_gxbb[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -111,7 +111,7 @@ static struct ddr_port_desc ddr_port_desc_gxbb[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_gxl[] __initdata = { +static struct ddr_port_desc ddr_port_desc_gxl[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -146,7 +146,7 @@ static struct ddr_port_desc ddr_port_desc_gxl[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_gxm[] __initdata = { +static struct ddr_port_desc ddr_port_desc_gxm[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI" }, { .port_id = 2, .port_name = "H265ENC" }, @@ -181,7 +181,7 @@ static struct ddr_port_desc ddr_port_desc_gxm[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_gxlx[] __initdata = { +static struct ddr_port_desc ddr_port_desc_gxlx[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -216,7 +216,7 @@ static struct ddr_port_desc ddr_port_desc_gxlx[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_g12a[] __initdata = { +static struct ddr_port_desc ddr_port_desc_g12a[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI" }, { .port_id = 2, .port_name = "PCIE" }, @@ -252,7 +252,7 @@ static struct ddr_port_desc ddr_port_desc_g12a[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_g12b[] __initdata = { +static struct ddr_port_desc ddr_port_desc_g12b[] = { { .port_id = 0, .port_name = "ARM-ADDR-E" }, { .port_id = 1, .port_name = "MALI" }, { .port_id = 2, .port_name = "PCIE" }, @@ -293,7 +293,7 @@ static struct ddr_port_desc ddr_port_desc_g12b[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_axg[] __initdata = { +static struct ddr_port_desc ddr_port_desc_axg[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "PCIE-A" }, { .port_id = 2, .port_name = "PCIE-B" }, @@ -315,7 +315,7 @@ static struct ddr_port_desc ddr_port_desc_axg[] __initdata = { { .port_id = 46, .port_name = "SPICC1" } }; -static struct ddr_port_desc ddr_port_desc_txl[] __initdata = { +static struct ddr_port_desc ddr_port_desc_txl[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -351,7 +351,7 @@ static struct ddr_port_desc ddr_port_desc_txl[] __initdata = { { .port_id = 47, .port_name = "DEMOD" } }; -static struct ddr_port_desc ddr_port_desc_txlx[] __initdata = { +static struct ddr_port_desc ddr_port_desc_txlx[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -387,7 +387,7 @@ static struct ddr_port_desc ddr_port_desc_txlx[] __initdata = { { .port_id = 47, .port_name = "DEMOD" } }; -static struct ddr_port_desc ddr_port_desc_txhd[] __initdata = { +static struct ddr_port_desc ddr_port_desc_txhd[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 2, .port_name = "MALI1" }, @@ -421,7 +421,7 @@ static struct ddr_port_desc ddr_port_desc_txhd[] __initdata = { { .port_id = 47, .port_name = "DEMOD" } }; -static struct ddr_port_desc ddr_port_desc_tl1[] __initdata = { +static struct ddr_port_desc ddr_port_desc_tl1[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI0" }, { .port_id = 3, .port_name = "HDCP_HDMI" }, @@ -456,7 +456,7 @@ static struct ddr_port_desc ddr_port_desc_tl1[] __initdata = { { .port_id = 47, .port_name = "DEMOD" } }; -static struct ddr_port_desc ddr_port_desc_sm1[] __initdata = { +static struct ddr_port_desc ddr_port_desc_sm1[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI" }, { .port_id = 2, .port_name = "PCIE" }, @@ -493,7 +493,7 @@ static struct ddr_port_desc ddr_port_desc_sm1[] __initdata = { { .port_id = 46, .port_name = "SANA" } }; -static struct ddr_port_desc ddr_port_desc_tm2[] __initdata = { +static struct ddr_port_desc ddr_port_desc_tm2[] = { { .port_id = 0, .port_name = "ARM" }, { .port_id = 1, .port_name = "MALI" }, { .port_id = 2, .port_name = "PCIE" }, @@ -537,7 +537,7 @@ static struct ddr_port_desc ddr_port_desc_tm2[] __initdata = { static struct ddr_port_desc *chip_ddr_port; static unsigned char chip_ddr_port_num; -int __init ddr_find_port_desc(int cpu_type, struct ddr_port_desc **desc) +int ddr_find_port_desc(int cpu_type, struct ddr_port_desc **desc) { int desc_size = -EINVAL; diff --git a/drivers/amlogic/ddr_tool/dmc_monitor.c b/drivers/amlogic/ddr_tool/dmc_monitor.c index 60308fd..1874038 100644 --- a/drivers/amlogic/ddr_tool/dmc_monitor.c +++ b/drivers/amlogic/ddr_tool/dmc_monitor.c @@ -43,9 +43,9 @@ static struct dmc_monitor *dmc_mon; -static unsigned long init_dev_mask __initdata; -static unsigned long init_start_addr __initdata; -static unsigned long init_end_addr __initdata; +static unsigned long init_dev_mask; +static unsigned long init_start_addr; +static unsigned long init_end_addr; static int __init early_dmc_param(char *buf) { -- 2.7.4