clk: bcm2835: Fix incorrect placement of __initconst
Subsystems (9)
PATCH 1/9 clk: bcm2835: Fix incorrect placement of __initconst
__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/clk-bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-bcm2835.c +1 -1
@@ -23,7 +23,7 @@#include <linux/clk-provider.h> #include <linux/of.h> -static const __initconst struct of_device_id clk_match[] = { +static const struct of_device_id clk_match[]__initconst = { { .compatible ="fixed-clock" , .data = of_fixed_clk_setup, }, { } };
Signature · 1 line
1.7.9.5
PATCH 2/9 clk: nomadik: Fix incorrect placement of __initconst
__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/clk-nomadik.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-nomadik.c +2 -2
@@ -479,12 +479,12 @@ static void __init of_nomadik_src_clk_setup(struct device_node *np)of_clk_add_provider (np, of_clk_src_simple_get, clk); } -static const __initconst struct of_device_id nomadik_src_match[] = { +static const struct of_device_id nomadik_src_match[]__initconst = { { .compatible ="stericsson,nomadik-src" }, {/* sentinel */ } }; -static const __initconst struct of_device_id nomadik_src_clk_match[] = { +static const struct of_device_id nomadik_src_clk_match[]__initconst = { { .compatible ="fixed-clock" , .data = of_fixed_clk_setup,
Signature · 1 line
1.7.9.5
PATCH 2/9 clk: nomadik: Fix incorrect placement of __initconst
Quoted 5 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.Signed-off-by Sachin Kamat <[email protected]>Cc Linus Walleij <[email protected]>
Yours,
Linus Walleij
PATCH 3/9 clk: u300: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
While at it also make 'u300_clk_lookup' static as it is used only in this file.
--- drivers/clk/clk-u300.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-u300.c +2 -2
@@ -746,7 +746,7 @@ struct u300_clock {u16 clk_val; }; -struct u300_clock const __initconst u300_clk_lookup[] = { +static struct u300_clock const u300_clk_lookup[]__initconst = { { .type =U300_CLK_TYPE_REST , .id =3 ,
@@ -1151,7 +1151,7 @@ static void __init of_u300_syscon_mclk_init(struct device_node *np)of_clk_add_provider (np, of_clk_src_simple_get, clk); } -static const __initconst struct of_device_id u300_clk_match[] = { +static const struct of_device_id u300_clk_match[]__initconst = { { .compatible ="fixed-clock" , .data = of_fixed_clk_setup,
Signature · 1 line
1.7.9.5
PATCH 3/9 clk: u300: Fix incorrect placement of __initconst
Quoted 8 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.While at it also make '
u300_clk_lookup' static as it is used only in this file.Signed-off-by Sachin Kamat <[email protected]>Cc Linus Walleij <[email protected]>
Yours,
Linus Walleij
PATCH 4/9 clk: armada-370: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/mvebu/armada-370.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/clk/mvebu/armada-370.c +7 -7
@@ -32,13 +32,13 @@enum {A370_CPU_TO_NBCLK ,A370_CPU_TO_HCLK ,A370_CPU_TO_DRAMCLK }; -static const struct coreclk_ratio __initconst a370_coreclk_ratios[] = { +static const struct coreclk_ratio a370_coreclk_ratios[]__initconst = { { .id =A370_CPU_TO_NBCLK , .name ="nbclk" }, { .id =A370_CPU_TO_HCLK , .name ="hclk" }, { .id =A370_CPU_TO_DRAMCLK , .name ="dramclk" }, }; -static const u32 __initconst a370_tclk_freqs[] = { +static const u32 a370_tclk_freqs[]__initconst = {16600000 ,20000000 , };
@@ -52,7 +52,7 @@ static u32 __init a370_get_tclk_freq(void __iomem *sar)return a370_tclk_freqs[tclk_freq_select]; } -static const u32 __initconst a370_cpu_freqs[] = { +static const u32 a370_cpu_freqs[]__initconst = {400000000 ,533000000 ,667000000 ,
@@ -78,7 +78,7 @@ static u32 __init a370_get_cpu_freq(void __iomem *sar)return cpu_freq; } -static const int __initconst a370_nbclk_ratios[32 ][2 ] = { +static const int a370_nbclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,2 }, {2 ,2 }, {1 ,2 }, {1 ,2 }, {1 ,1 }, {2 ,3 }, {0 ,1 }, {1 ,2 }, {2 ,4 }, {0 ,1 },
@@ -89,7 +89,7 @@ static const int __initconst a370_nbclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst a370_hclk_ratios[32 ][2 ] = { +static const int a370_hclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,6 }, {2 ,3 }, {1 ,3 }, {1 ,4 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 6}, {2, 10}, {0, 1},
@@ -100,7 +100,7 @@ static const int __initconst a370_hclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst a370_dramclk_ratios[32 ][2 ] = { +static const int a370_dramclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,3 }, {2 ,3 }, {1 ,3 }, {1 ,2 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 3}, {2, 5}, {0, 1},
@@ -152,7 +152,7 @@ CLK_OF_DECLARE(a370_core_clk, "marvell,armada-370-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst a370_gating_desc[] = { +static const struct clk_gating_soc_desc a370_gating_desc[]__initconst = { {"audio" ,NULL ,0 ,0 }, {"pex0_en" ,NULL ,1 ,0 }, {"pex1_en" ,NULL ,2 ,0 },
Signature · 1 line
1.7.9.5
PATCH 4/9 clk: armada-370: Fix incorrect placement of __initconst
Quoted 2 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.
Quoted 73 lines
Signed-off-by Sachin Kamat <[email protected]>Cc Gregory Clement <[email protected]>--- drivers/clk/mvebu/armada-370.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/clk/mvebu/armada-370.c +7
-7@@ -32,13 +32,13 @@enum {A370_CPU_TO_NBCLK ,A370_CPU_TO_HCLK ,A370_CPU_TO_DRAMCLK }; -static const struct coreclk_ratio __initconst a370_coreclk_ratios[] = { +static const struct coreclk_ratio a370_coreclk_ratios[]__initconst = { { .id =A370_CPU_TO_NBCLK , .name ="nbclk" }, { .id =A370_CPU_TO_HCLK , .name ="hclk" }, { .id =A370_CPU_TO_DRAMCLK , .name ="dramclk" }, }; -static const u32 __initconst a370_tclk_freqs[] = { +static const u32 a370_tclk_freqs[]__initconst = {16600000 ,20000000 , };@@ -52,7 +52,7 @@ static u32 __init a370_get_tclk_freq(void __iomem *sar)return a370_tclk_freqs[tclk_freq_select]; } -static const u32 __initconst a370_cpu_freqs[] = { +static const u32 a370_cpu_freqs[]__initconst = {400000000 ,533000000 ,667000000 ,@@ -78,7 +78,7 @@ static u32 __init a370_get_cpu_freq(void __iomem *sar)return cpu_freq; } -static const int __initconst a370_nbclk_ratios[32 ][2 ] = { +static const int a370_nbclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,2 }, {2 ,2 }, {1 ,2 }, {1 ,2 }, {1 ,1 }, {2 ,3 }, {0 ,1 }, {1 ,2 }, {2 ,4 }, {0 ,1 },@@ -89,7 +89,7 @@ static const int __initconst a370_nbclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst a370_hclk_ratios[32 ][2 ] = { +static const int a370_hclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,6 }, {2 ,3 }, {1 ,3 }, {1 ,4 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 6}, {2, 10}, {0, 1},@@ -100,7 +100,7 @@ static const int __initconst a370_hclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst a370_dramclk_ratios[32 ][2 ] = { +static const int a370_dramclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,3 }, {2 ,3 }, {1 ,3 }, {1 ,2 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 3}, {2, 5}, {0, 1},@@ -152,7 +152,7 @@ CLK_OF_DECLARE(a370_core_clk, "marvell,armada-370-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst a370_gating_desc[] = { +static const struct clk_gating_soc_desc a370_gating_desc[]__initconst = { {"audio" ,NULL ,0 ,0 }, {"pex0_en" ,NULL ,1 ,0 }, {"pex1_en" ,NULL ,2 ,0 },
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 5/9 clk: armada-xp: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/mvebu/armada-xp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/mvebu/armada-xp.c +6 -6
@@ -40,7 +40,7 @@enum {AXP_CPU_TO_NBCLK ,AXP_CPU_TO_HCLK ,AXP_CPU_TO_DRAMCLK }; -static const struct coreclk_ratio __initconst axp_coreclk_ratios[] = { +static const struct coreclk_ratio axp_coreclk_ratios[]__initconst = { { .id =AXP_CPU_TO_NBCLK , .name ="nbclk" }, { .id =AXP_CPU_TO_HCLK , .name ="hclk" }, { .id =AXP_CPU_TO_DRAMCLK , .name ="dramclk" },
@@ -52,7 +52,7 @@ static u32 __init axp_get_tclk_freq(void __iomem *sar)return 250000000 ; } -static const u32 __initconst axp_cpu_freqs[] = { +static const u32 axp_cpu_freqs[]__initconst = {1000000000 ,1066000000 ,1200000000 ,
@@ -89,7 +89,7 @@ static u32 __init axp_get_cpu_freq(void __iomem *sar)return cpu_freq; } -static const int __initconst axp_nbclk_ratios[32 ][2 ] = { +static const int axp_nbclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,2 }, {2 ,2 }, {1 ,2 }, {1 ,2 }, {1 ,1 }, {2 ,3 }, {0 ,1 }, {1 ,2 }, {2 ,4 }, {0 ,1 },
@@ -100,7 +100,7 @@ static const int __initconst axp_nbclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst axp_hclk_ratios[32 ][2 ] = { +static const int axp_hclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,6 }, {2 ,3 }, {1 ,3 }, {1 ,4 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 6}, {2, 10}, {0, 1},
@@ -111,7 +111,7 @@ static const int __initconst axp_hclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst axp_dramclk_ratios[32 ][2 ] = { +static const int axp_dramclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,3 }, {2 ,3 }, {1 ,3 }, {1 ,2 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 3}, {2, 5}, {0, 1},
@@ -169,7 +169,7 @@ CLK_OF_DECLARE(axp_core_clk, "marvell,armada-xp-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst axp_gating_desc[] = { +static const struct clk_gating_soc_desc axp_gating_desc[]__initconst = { {"audio" ,NULL ,0 ,0 }, {"ge3" ,NULL ,1 ,0 }, {"ge2" ,NULL ,2 ,0 },
Signature · 1 line
1.7.9.5
PATCH 5/9 clk: armada-xp: Fix incorrect placement of __initconst
Quoted 3 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.
Quoted 65 lines
Signed-off-by Sachin Kamat <[email protected]>Cc Gregory Clement <[email protected]>--- drivers/clk/mvebu/armada-xp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/clk/mvebu/armada-xp.c +6
-6@@ -40,7 +40,7 @@enum {AXP_CPU_TO_NBCLK ,AXP_CPU_TO_HCLK ,AXP_CPU_TO_DRAMCLK }; -static const struct coreclk_ratio __initconst axp_coreclk_ratios[] = { +static const struct coreclk_ratio axp_coreclk_ratios[]__initconst = { { .id =AXP_CPU_TO_NBCLK , .name ="nbclk" }, { .id =AXP_CPU_TO_HCLK , .name ="hclk" }, { .id =AXP_CPU_TO_DRAMCLK , .name ="dramclk" },@@ -52,7 +52,7 @@ static u32 __init axp_get_tclk_freq(void __iomem *sar)return 250000000 ; } -static const u32 __initconst axp_cpu_freqs[] = { +static const u32 axp_cpu_freqs[]__initconst = {1000000000 ,1066000000 ,1200000000 ,@@ -89,7 +89,7 @@ static u32 __init axp_get_cpu_freq(void __iomem *sar)return cpu_freq; } -static const int __initconst axp_nbclk_ratios[32 ][2 ] = { +static const int axp_nbclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,2 }, {2 ,2 }, {1 ,2 }, {1 ,2 }, {1 ,1 }, {2 ,3 }, {0 ,1 }, {1 ,2 }, {2 ,4 }, {0 ,1 },@@ -100,7 +100,7 @@ static const int __initconst axp_nbclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst axp_hclk_ratios[32 ][2 ] = { +static const int axp_hclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,6 }, {2 ,3 }, {1 ,3 }, {1 ,4 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 6}, {2, 10}, {0, 1},@@ -111,7 +111,7 @@ static const int __initconst axp_hclk_ratios[32][2] = { {0, 1}, {0, 1}, {0, 1}, {0, 1}, }; -static const int __initconst axp_dramclk_ratios[32 ][2 ] = { +static const int axp_dramclk_ratios[32 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {2 ,3 }, {2 ,3 }, {1 ,3 }, {1 ,2 }, {1 ,2 }, {2 ,6 }, {0, 1}, {1, 3}, {2, 5}, {0, 1},@@ -169,7 +169,7 @@ CLK_OF_DECLARE(axp_core_clk, "marvell,armada-xp-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst axp_gating_desc[] = { +static const struct clk_gating_soc_desc axp_gating_desc[]__initconst = { {"audio" ,NULL ,0 ,0 }, {"ge3" ,NULL ,1 ,0 }, {"ge2" ,NULL ,2 ,0 },
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 6/9 clk: dove: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/mvebu/dove.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/mvebu/dove.c +6 -6
@@ -74,12 +74,12 @@enum {DOVE_CPU_TO_L2 ,DOVE_CPU_TO_DDR }; -static const struct coreclk_ratio __initconst dove_coreclk_ratios[] = { +static const struct coreclk_ratio dove_coreclk_ratios[]__initconst = { { .id =DOVE_CPU_TO_L2 , .name ="l2clk" , }, { .id =DOVE_CPU_TO_DDR , .name ="ddrclk" , } }; -static const u32 __initconst dove_tclk_freqs[] = { +static const u32 dove_tclk_freqs[]__initconst = {166666667 ,125000000 ,0 ,0
@@ -92,7 +92,7 @@ static u32 __init dove_get_tclk_freq(void __iomem *sar)return dove_tclk_freqs[opt]; } -static const u32 __initconst dove_cpu_freqs[] = { +static const u32 dove_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,0 ,1000000000 ,933333333 ,933333333 ,
@@ -111,12 +111,12 @@ static u32 __init dove_get_cpu_freq(void __iomem *sar)return dove_cpu_freqs[opt]; } -static const int __initconst dove_cpu_l2_ratios[8 ][2 ] = { +static const int dove_cpu_l2_ratios[8 ][2 ]__initconst = { {1 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 } }; -static const int __initconst dove_cpu_ddr_ratios[16 ][2 ] = { +static const int dove_cpu_ddr_ratios[16 ][2 ]__initconst = { {1 ,1 }, {0 ,1 }, {1 ,2 }, {2 ,5 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 }, {1 ,5 }, {0 ,1 }, {1 ,6 }, {0 ,1 },
@@ -164,7 +164,7 @@ CLK_OF_DECLARE(dove_core_clk, "marvell,dove-core-clock", dove_coreclk_init);* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst dove_gating_desc[] = { +static const struct clk_gating_soc_desc dove_gating_desc[]__initconst = { {"usb0" ,NULL ,0 ,0 }, {"usb1" ,NULL ,1 ,0 }, {"ge" ,"gephy" ,2 ,0 },
Signature · 1 line
1.7.9.5
PATCH 6/9 clk: dove: Fix incorrect placement of __initconst
Quoted 3 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.
Quoted 59 lines
Signed-off-by Sachin Kamat <[email protected]>Cc Gregory Clement <[email protected]>--- drivers/clk/mvebu/dove.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/clk/mvebu/dove.c +6
-6@@ -74,12 +74,12 @@enum {DOVE_CPU_TO_L2 ,DOVE_CPU_TO_DDR }; -static const struct coreclk_ratio __initconst dove_coreclk_ratios[] = { +static const struct coreclk_ratio dove_coreclk_ratios[]__initconst = { { .id =DOVE_CPU_TO_L2 , .name ="l2clk" , }, { .id =DOVE_CPU_TO_DDR , .name ="ddrclk" , } }; -static const u32 __initconst dove_tclk_freqs[] = { +static const u32 dove_tclk_freqs[]__initconst = {166666667 ,125000000 ,0 ,0 @@ -92,7 +92,7 @@ static u32 __init dove_get_tclk_freq(void __iomem *sar)return dove_tclk_freqs[opt]; } -static const u32 __initconst dove_cpu_freqs[] = { +static const u32 dove_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,0 ,1000000000 ,933333333 ,933333333 ,@@ -111,12 +111,12 @@ static u32 __init dove_get_cpu_freq(void __iomem *sar)return dove_cpu_freqs[opt]; } -static const int __initconst dove_cpu_l2_ratios[8 ][2 ] = { +static const int dove_cpu_l2_ratios[8 ][2 ]__initconst = { {1 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 } }; -static const int __initconst dove_cpu_ddr_ratios[16 ][2 ] = { +static const int dove_cpu_ddr_ratios[16 ][2 ]__initconst = { {1 ,1 }, {0 ,1 }, {1 ,2 }, {2 ,5 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 }, {1 ,5 }, {0 ,1 }, {1 ,6 }, {0 ,1 },@@ -164,7 +164,7 @@ CLK_OF_DECLARE(dove_core_clk, "marvell,dove-core-clock", dove_coreclk_init);* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst dove_gating_desc[] = { +static const struct clk_gating_soc_desc dove_gating_desc[]__initconst = { {"usb0" ,NULL ,0 ,0 }, {"usb1" ,NULL ,1 ,0 }, {"ge" ,"gephy" ,2 ,0 },
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 7/9 clk: kirkwood: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/mvebu/kirkwood.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/clk/mvebu/kirkwood.c +7 -7
@@ -78,7 +78,7 @@enum {KIRKWOOD_CPU_TO_L2 ,KIRKWOOD_CPU_TO_DDR }; -static const struct coreclk_ratio __initconst kirkwood_coreclk_ratios[] = { +static const struct coreclk_ratio kirkwood_coreclk_ratios[]__initconst = { { .id =KIRKWOOD_CPU_TO_L2 , .name ="l2clk" , }, { .id =KIRKWOOD_CPU_TO_DDR , .name ="ddrclk" , } };
@@ -90,7 +90,7 @@ static u32 __init kirkwood_get_tclk_freq(void __iomem *sar)return (opt) ?166666667 :200000000 ; } -static const u32 __initconst kirkwood_cpu_freqs[] = { +static const u32 kirkwood_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,600000000 ,0 ,
@@ -111,12 +111,12 @@ static u32 __init kirkwood_get_cpu_freq(void __iomem *sar)return kirkwood_cpu_freqs[opt]; } -static const int __initconst kirkwood_cpu_l2_ratios[8 ][2 ] = { +static const int kirkwood_cpu_l2_ratios[8 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 }, {0 ,1 } }; -static const int __initconst kirkwood_cpu_ddr_ratios[16 ][2 ] = { +static const int kirkwood_cpu_ddr_ratios[16 ][2 ]__initconst = { {0 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {2 ,9 }, {1 ,5 }, {1 ,6 }, {0 ,1 }, {0 ,1 },
@@ -145,7 +145,7 @@ static void __init kirkwood_get_clk_ratio( } } -static const u32 __initconst mv88f6180_cpu_freqs[] = { +static const u32 mv88f6180_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,0 ,600000000 ,800000000 ,
@@ -158,7 +158,7 @@ static u32 __init mv88f6180_get_cpu_freq(void __iomem *sar)return mv88f6180_cpu_freqs[opt]; } -static const int __initconst mv88f6180_cpu_ddr_ratios[8 ][2 ] = { +static const int mv88f6180_cpu_ddr_ratios[8 ][2 ]__initconst = { {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {1 ,3 }, {1 ,4 }, {1 ,5 } };
@@ -219,7 +219,7 @@ CLK_OF_DECLARE(mv88f6180_core_clk, "marvell,mv88f6180-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst kirkwood_gating_desc[] = { +static const struct clk_gating_soc_desc kirkwood_gating_desc[]__initconst = { {"ge0" ,NULL ,0 ,0 }, {"pex0" ,NULL ,2 ,0 }, {"usb0" ,NULL ,3 ,0 },
Signature · 1 line
1.7.9.5
PATCH 7/9 clk: kirkwood: Fix incorrect placement of __initconst
Quoted 3 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.
Quoted 71 lines
Signed-off-by Sachin Kamat <[email protected]>Cc Gregory Clement <[email protected]>--- drivers/clk/mvebu/kirkwood.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/clk/mvebu/kirkwood.c +7
-7@@ -78,7 +78,7 @@enum {KIRKWOOD_CPU_TO_L2 ,KIRKWOOD_CPU_TO_DDR }; -static const struct coreclk_ratio __initconst kirkwood_coreclk_ratios[] = { +static const struct coreclk_ratio kirkwood_coreclk_ratios[]__initconst = { { .id =KIRKWOOD_CPU_TO_L2 , .name ="l2clk" , }, { .id =KIRKWOOD_CPU_TO_DDR , .name ="ddrclk" , } };@@ -90,7 +90,7 @@ static u32 __init kirkwood_get_tclk_freq(void __iomem *sar)return (opt) ?166666667 :200000000 ; } -static const u32 __initconst kirkwood_cpu_freqs[] = { +static const u32 kirkwood_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,600000000 ,0 ,@@ -111,12 +111,12 @@ static u32 __init kirkwood_get_cpu_freq(void __iomem *sar)return kirkwood_cpu_freqs[opt]; } -static const int __initconst kirkwood_cpu_l2_ratios[8 ][2 ] = { +static const int kirkwood_cpu_l2_ratios[8 ][2 ]__initconst = { {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {0 ,1 }, {0 ,1 } }; -static const int __initconst kirkwood_cpu_ddr_ratios[16 ][2 ] = { +static const int kirkwood_cpu_ddr_ratios[16 ][2 ]__initconst = { {0 ,1 }, {0 ,1 }, {1 ,2 }, {0 ,1 }, {1 ,3 }, {0 ,1 }, {1 ,4 }, {2 ,9 }, {1 ,5 }, {1 ,6 }, {0 ,1 }, {0 ,1 },@@ -145,7 +145,7 @@ static void __init kirkwood_get_clk_ratio( } } -static const u32 __initconst mv88f6180_cpu_freqs[] = { +static const u32 mv88f6180_cpu_freqs[]__initconst = {0 ,0 ,0 ,0 ,0 ,600000000 ,800000000 ,@@ -158,7 +158,7 @@ static u32 __init mv88f6180_get_cpu_freq(void __iomem *sar)return mv88f6180_cpu_freqs[opt]; } -static const int __initconst mv88f6180_cpu_ddr_ratios[8 ][2 ] = { +static const int mv88f6180_cpu_ddr_ratios[8 ][2 ]__initconst = { {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {0 ,1 }, {1 ,3 }, {1 ,4 }, {1 ,5 } };@@ -219,7 +219,7 @@ CLK_OF_DECLARE(mv88f6180_core_clk, "marvell,mv88f6180-core-clock",* Clock Gating Control */ -static const struct clk_gating_soc_desc __initconst kirkwood_gating_desc[] = { +static const struct clk_gating_soc_desc kirkwood_gating_desc[]__initconst = { {"ge0" ,NULL ,0 ,0 }, {"pex0" ,NULL ,2 ,0 }, {"usb0" ,NULL ,3 ,0 },
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 8/9 clk: sunxi: Fix incorrect placement of __initconst
In reply to Sachin Kamat__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/sunxi/clk-sunxi.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/clk/sunxi/clk-sunxi.c +19 -19
@@ -196,12 +196,12 @@ static struct clk_factors_config apb1_config = { .pwidth = 2, }; -static const __initconst struct factors_data pll1_data = { +static const struct factors_data pll1_data__initconst = { .table = &pll1_config, .getter = sunxi_get_pll1_factors, }; -static const __initconst struct factors_data apb1_data = { +static const struct factors_data apb1_data__initconst = { .table = &apb1_config, .getter = sunxi_get_apb1_factors, };
@@ -239,11 +239,11 @@ struct mux_data {u8 shift; }; -static const __initconst struct mux_data cpu_mux_data = { +static const struct mux_data cpu_mux_data__initconst = { .shift =16 , }; -static const __initconst struct mux_data apb1_mux_data = { +static const struct mux_data apb1_mux_data__initconst = { .shift =24 , };
@@ -284,17 +284,17 @@ struct div_data {u8 pow; }; -static const __initconst struct div_data axi_data = { +static const struct div_data axi_data__initconst = { .shift =0 , .pow =0 , }; -static const __initconst struct div_data ahb_data = { +static const struct div_data ahb_data__initconst = { .shift =4 , .pow =1 , }; -static const __initconst struct div_data apb0_data = { +static const struct div_data apb0_data__initconst = { .shift =8 , .pow =1 , };
@@ -333,31 +333,31 @@ struct gates_data {DECLARE_BITMAP (mask,SUNXI_GATES_MAX_SIZE ); }; -static const __initconst struct gates_data sun4i_axi_gates_data = { +static const struct gates_data sun4i_axi_gates_data__initconst = { .mask = {1 }, }; -static const __initconst struct gates_data sun4i_ahb_gates_data = { +static const struct gates_data sun4i_ahb_gates_data__initconst = { .mask = {0x7F77FFF ,0x14FB3F }, }; -static const __initconst struct gates_data sun5i_a13_ahb_gates_data = { +static const struct gates_data sun5i_a13_ahb_gates_data__initconst = { .mask = {0x107067e7 ,0x185111 }, }; -static const __initconst struct gates_data sun4i_apb0_gates_data = { +static const struct gates_data sun4i_apb0_gates_data__initconst = { .mask = {0x4EF }, }; -static const __initconst struct gates_data sun5i_a13_apb0_gates_data = { +static const struct gates_data sun5i_a13_apb0_gates_data__initconst = { .mask = {0x61 }, }; -static const __initconst struct gates_data sun4i_apb1_gates_data = { +static const struct gates_data sun4i_apb1_gates_data__initconst = { .mask = {0xFF00F7 }, }; -static const __initconst struct gates_data sun5i_a13_apb1_gates_data = { +static const struct gates_data sun5i_a13_apb1_gates_data__initconst = { .mask = {0xa0007 }, };
@@ -411,20 +411,20 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, }/* Matches for of_clk_init */ -static const __initconst struct of_device_id clk_match[] = { +static const struct of_device_id clk_match[]__initconst = { {.compatible ="allwinner,sun4i-osc-clk" , .data = sunxi_osc_clk_setup,}, {} };/* Matches for factors clocks */ -static const __initconst struct of_device_id clk_factors_match[] = { +static const struct of_device_id clk_factors_match[]__initconst = { {.compatible ="allwinner,sun4i-pll1-clk" , .data = &pll1_data,}, {.compatible ="allwinner,sun4i-apb1-clk" , .data = &apb1_data,}, {} };/* Matches for divider clocks */ -static const __initconst struct of_device_id clk_div_match[] = { +static const struct of_device_id clk_div_match[]__initconst = { {.compatible ="allwinner,sun4i-axi-clk" , .data = &axi_data,}, {.compatible ="allwinner,sun4i-ahb-clk" , .data = &ahb_data,}, {.compatible ="allwinner,sun4i-apb0-clk" , .data = &apb0_data,},
@@ -432,14 +432,14 @@ static const __initconst struct of_device_id clk_div_match[] = { };/* Matches for mux clocks */ -static const __initconst struct of_device_id clk_mux_match[] = { +static const struct of_device_id clk_mux_match[]__initconst = { {.compatible ="allwinner,sun4i-cpu-clk" , .data = &cpu_mux_data,}, {.compatible ="allwinner,sun4i-apb1-mux-clk" , .data = &apb1_mux_data,}, {} };/* Matches for gate clocks */ -static const __initconst struct of_device_id clk_gates_match[] = { +static const struct of_device_id clk_gates_match[]__initconst = { {.compatible ="allwinner,sun4i-axi-gates-clk" , .data = &sun4i_axi_gates_data,}, {.compatible ="allwinner,sun4i-ahb-gates-clk" , .data = &sun4i_ahb_gates_data,}, {.compatible ="allwinner,sun5i-a13-ahb-gates-clk" , .data = &sun5i_a13_ahb_gates_data,},
Signature · 1 line
1.7.9.5
PATCH 8/9 clk: sunxi: Fix incorrect placement of __initconst
Quoting Sachin Kamat (2013-08-12 02:14:06)
Quoted 5 lines
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.Signed-off-by Sachin Kamat <[email protected]>Cc Emilio L?pez <[email protected]>
Thanks much for this cleanup! I've applied all of the patches in this series. This patch required reflow due to recent changes to the sunxi clock driver. Below is what I merged. Let me know if there are any issues.
Regards,
Mike
Quoted 1 line
From
52be7cc862942ea0a53031b3b1ca84dc95422b5bMon Sep 17 00:00:00 2001
From: Sachin Kamat <[email protected]>
Date: Mon, 12 Aug 2013 14:44:06 +0530
Subject: [PATCH] clk: sunxi: Fix incorrect placement of __initconst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
__initconst should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/sunxi/clk-sunxi.c | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-)
drivers/clk/sunxi/clk-sunxi.c +30 -30
@@ -288,17 +288,17 @@ static struct clk_factors_config sun4i_apb1_config = { .pwidth = 2, }; -static const __initconst struct factors_data sun4i_pll1_data = { +static const struct factors_data sun4i_pll1_data__initconst = { .table = &sun4i_pll1_config, .getter = sun4i_get_pll1_factors, }; -static const __initconst struct factors_data sun6i_a31_pll1_data = { +static const struct factors_data sun6i_a31_pll1_data__initconst = { .table = &sun6i_a31_pll1_config, .getter = sun6i_a31_get_pll1_factors, }; -static const __initconst struct factors_data sun4i_apb1_data = { +static const struct factors_data sun4i_apb1_data__initconst = { .table = &sun4i_apb1_config, .getter = sun4i_get_apb1_factors, };
@@ -336,15 +336,15 @@ struct mux_data {u8 shift; }; -static const __initconst struct mux_data sun4i_cpu_mux_data = { +static const struct mux_data sun4i_cpu_mux_data__initconst = { .shift =16 , }; -static const __initconst struct mux_data sun6i_a31_ahb1_mux_data = { +static const struct mux_data sun6i_a31_ahb1_mux_data__initconst = { .shift =12 , }; -static const __initconst struct mux_data sun4i_apb1_mux_data = { +static const struct mux_data sun4i_apb1_mux_data__initconst = { .shift =24 , };
@@ -385,25 +385,25 @@ struct div_data {u8 width; }; -static const __initconst struct div_data sun4i_axi_data = { +static const struct div_data sun4i_axi_data__initconst = { .shift =0 , .pow =0 , .width =2 , }; -static const __initconst struct div_data sun4i_ahb_data = { +static const struct div_data sun4i_ahb_data__initconst = { .shift =4 , .pow =1 , .width =2 , }; -static const __initconst struct div_data sun4i_apb0_data = { +static const struct div_data sun4i_apb0_data__initconst = { .shift =8 , .pow =1 , .width =2 , }; -static const __initconst struct div_data sun6i_a31_apb2_div_data = { +static const struct div_data sun6i_a31_apb2_div_data__initconst = { .shift =0 , .pow =0 , .width =4 ,
@@ -443,67 +443,67 @@ struct gates_data {DECLARE_BITMAP (mask,SUNXI_GATES_MAX_SIZE ); }; -static const __initconst struct gates_data sun4i_axi_gates_data = { +static const struct gates_data sun4i_axi_gates_data__initconst = { .mask = {1 }, }; -static const __initconst struct gates_data sun4i_ahb_gates_data = { +static const struct gates_data sun4i_ahb_gates_data__initconst = { .mask = {0x7F77FFF ,0x14FB3F }, }; -static const __initconst struct gates_data sun5i_a10s_ahb_gates_data = { +static const struct gates_data sun5i_a10s_ahb_gates_data__initconst = { .mask = {0x147667e7 ,0x185915 }, }; -static const __initconst struct gates_data sun5i_a13_ahb_gates_data = { +static const struct gates_data sun5i_a13_ahb_gates_data__initconst = { .mask = {0x107067e7 ,0x185111 }, }; -static const __initconst struct gates_data sun6i_a31_ahb1_gates_data = { +static const struct gates_data sun6i_a31_ahb1_gates_data__initconst = { .mask = {0xEDFE7F62 ,0x794F931 }, }; -static const __initconst struct gates_data sun7i_a20_ahb_gates_data = { +static const struct gates_data sun7i_a20_ahb_gates_data__initconst = { .mask = {0x12f77fff ,0x16ff3f }, }; -static const __initconst struct gates_data sun4i_apb0_gates_data = { +static const struct gates_data sun4i_apb0_gates_data__initconst = { .mask = {0x4EF }, }; -static const __initconst struct gates_data sun5i_a10s_apb0_gates_data = { +static const struct gates_data sun5i_a10s_apb0_gates_data__initconst = { .mask = {0x469 }, }; -static const __initconst struct gates_data sun5i_a13_apb0_gates_data = { +static const struct gates_data sun5i_a13_apb0_gates_data__initconst = { .mask = {0x61 }, }; -static const __initconst struct gates_data sun7i_a20_apb0_gates_data = { +static const struct gates_data sun7i_a20_apb0_gates_data__initconst = { .mask = {0x4ff }, }; -static const __initconst struct gates_data sun4i_apb1_gates_data = { +static const struct gates_data sun4i_apb1_gates_data__initconst = { .mask = {0xFF00F7 }, }; -static const __initconst struct gates_data sun5i_a10s_apb1_gates_data = { +static const struct gates_data sun5i_a10s_apb1_gates_data__initconst = { .mask = {0xf0007 }, }; -static const __initconst struct gates_data sun5i_a13_apb1_gates_data = { +static const struct gates_data sun5i_a13_apb1_gates_data__initconst = { .mask = {0xa0007 }, }; -static const __initconst struct gates_data sun6i_a31_apb1_gates_data = { +static const struct gates_data sun6i_a31_apb1_gates_data__initconst = { .mask = {0x3031 }, }; -static const __initconst struct gates_data sun6i_a31_apb2_gates_data = { +static const struct gates_data sun6i_a31_apb2_gates_data__initconst = { .mask = {0x3F000F }, }; -static const __initconst struct gates_data sun7i_a20_apb1_gates_data = { +static const struct gates_data sun7i_a20_apb1_gates_data__initconst = { .mask = {0xff80ff }, };
@@ -557,7 +557,7 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, }/* Matches for factors clocks */ -static const __initconst struct of_device_id clk_factors_match[] = { +static const struct of_device_id clk_factors_match[]__initconst = { {.compatible ="allwinner,sun4i-pll1-clk" , .data = &sun4i_pll1_data,}, {.compatible ="allwinner,sun6i-a31-pll1-clk" , .data = &sun6i_a31_pll1_data,}, {.compatible ="allwinner,sun4i-apb1-clk" , .data = &sun4i_apb1_data,},
@@ -565,7 +565,7 @@ static const __initconst struct of_device_id clk_factors_match[] = { };/* Matches for divider clocks */ -static const __initconst struct of_device_id clk_div_match[] = { +static const struct of_device_id clk_div_match[]__initconst = { {.compatible ="allwinner,sun4i-axi-clk" , .data = &sun4i_axi_data,}, {.compatible ="allwinner,sun4i-ahb-clk" , .data = &sun4i_ahb_data,}, {.compatible ="allwinner,sun4i-apb0-clk" , .data = &sun4i_apb0_data,},
@@ -574,7 +574,7 @@ static const __initconst struct of_device_id clk_div_match[] = { };/* Matches for mux clocks */ -static const __initconst struct of_device_id clk_mux_match[] = { +static const struct of_device_id clk_mux_match[]__initconst = { {.compatible ="allwinner,sun4i-cpu-clk" , .data = &sun4i_cpu_mux_data,}, {.compatible ="allwinner,sun4i-apb1-mux-clk" , .data = &sun4i_apb1_mux_data,}, {.compatible ="allwinner,sun6i-a31-ahb1-mux-clk" , .data = &sun6i_a31_ahb1_mux_data,},
@@ -582,7 +582,7 @@ static const __initconst struct of_device_id clk_mux_match[] = { };/* Matches for gate clocks */ -static const __initconst struct of_device_id clk_gates_match[] = { +static const struct of_device_id clk_gates_match[]__initconst = { {.compatible ="allwinner,sun4i-axi-gates-clk" , .data = &sun4i_axi_gates_data,}, {.compatible ="allwinner,sun4i-ahb-gates-clk" , .data = &sun4i_ahb_gates_data,}, {.compatible ="allwinner,sun5i-a10s-ahb-gates-clk" , .data = &sun5i_a10s_ahb_gates_data,},
Signature · 1 line
1.8.1.2
PATCH 9/9 clk: s3c64xx: Fix incorrect placement of __initdata
In reply to Sachin Kamat__initdata should be placed between the variable name and equal sign for the variable to be placed in the intended section.
--- drivers/clk/samsung/clk-s3c64xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/samsung/clk-s3c64xx.c +2 -2
@@ -65,7 +65,7 @@ enum s3c64xx_plls {* List of controller registers to be saved and restored during * a suspend/resume cycle. */ -static __initdata unsigned long s3c64xx_clk_regs[] = { +static unsigned long s3c64xx_clk_regs[]__initdata = {APLL_LOCK ,MPLL_LOCK ,EPLL_LOCK ,
@@ -82,7 +82,7 @@ static __initdata unsigned long s3c64xx_clk_regs[] = { SCLK_GATE, }; -static __initdata unsigned long s3c6410_clk_regs[] = { +static unsigned long s3c6410_clk_regs[]__initdata = {CLK_SRC2 ,MEM0_GATE , };
Signature · 1 line
1.7.9.5
PATCH 1/9 clk: bcm2835: Fix incorrect placement of __initconst
In reply to Sachin KamatQuoted 2 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.
I assume Mike will take this through the clk tree.
PATCH 1/9 clk: bcm2835: Fix incorrect placement of __initconst
Hi Mike,
Quoted 7 lines · Stephen Warren
Quoted 2 lines · Sachin Kamat
__initconstshould be placed between the variable name and equal sign for the variable to be placed in the intended section.Acked-by Stephen Warren <[email protected]>I assume Mike will take this through the clk tree.
Please take this series.
Signature · 2 lines
With warm regards, Sachin