aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-03-31 14:50:42 -0400
committerStephen Boyd <sboyd@codeaurora.org>2015-04-01 13:59:27 -0400
commitf375573c96470a27b911aeb1c0a25212d0e145a2 (patch)
treeb3033521ae30928a059f0a992f50349765f709ad
parentaa571b148c6ab9843e79622f0209b6163d8d4fc5 (diff)
clk: constify of_device_id array
of_device_id is always used as const. (See driver.of_match_table and open firmware functions) __initdata updated to __initconst for static const struct of_device_id ti_clkdm_match_table[] Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/clk-palmas.c2
-rw-r--r--drivers/clk/st/clkgen-fsyn.c2
-rw-r--r--drivers/clk/st/clkgen-mux.c8
-rw-r--r--drivers/clk/st/clkgen-pll.c4
-rw-r--r--drivers/clk/ti/clk-dra7-atl.c2
-rw-r--r--drivers/clk/ti/clockdomain.c2
-rw-r--r--drivers/clk/versatile/clk-vexpress-osc.c2
7 files changed, 11 insertions, 11 deletions
diff --git a/drivers/clk/clk-palmas.c b/drivers/clk/clk-palmas.c
index 8d459923a15f..45a535ab48aa 100644
--- a/drivers/clk/clk-palmas.c
+++ b/drivers/clk/clk-palmas.c
@@ -161,7 +161,7 @@ static struct palmas_clks_of_match_data palmas_of_clk32kgaudio = {
161 }, 161 },
162}; 162};
163 163
164static struct of_device_id palmas_clks_of_match[] = { 164static const struct of_device_id palmas_clks_of_match[] = {
165 { 165 {
166 .compatible = "ti,palmas-clk32kg", 166 .compatible = "ti,palmas-clk32kg",
167 .data = &palmas_of_clk32kg, 167 .data = &palmas_of_clk32kg,
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c
index af94ed82cfcb..a917c4c7eaa9 100644
--- a/drivers/clk/st/clkgen-fsyn.c
+++ b/drivers/clk/st/clkgen-fsyn.c
@@ -1057,7 +1057,7 @@ static struct clk * __init st_clk_register_quadfs_fsynth(
1057 return clk; 1057 return clk;
1058} 1058}
1059 1059
1060static struct of_device_id quadfs_of_match[] = { 1060static const struct of_device_id quadfs_of_match[] = {
1061 { 1061 {
1062 .compatible = "st,stih416-quadfs216", 1062 .compatible = "st,stih416-quadfs216",
1063 .data = &st_fs216c65_416 1063 .data = &st_fs216c65_416
diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c
index 9a15ec344a85..fdcff10f6d30 100644
--- a/drivers/clk/st/clkgen-mux.c
+++ b/drivers/clk/st/clkgen-mux.c
@@ -341,7 +341,7 @@ static struct clkgena_divmux_data st_divmux_c32odf3 = {
341 .fb_start_bit_idx = 24, 341 .fb_start_bit_idx = 24,
342}; 342};
343 343
344static struct of_device_id clkgena_divmux_of_match[] = { 344static const struct of_device_id clkgena_divmux_of_match[] = {
345 { 345 {
346 .compatible = "st,clkgena-divmux-c65-hs", 346 .compatible = "st,clkgena-divmux-c65-hs",
347 .data = &st_divmux_c65hs, 347 .data = &st_divmux_c65hs,
@@ -479,7 +479,7 @@ static struct clkgena_prediv_data prediv_c32_data = {
479 .table = prediv_table16, 479 .table = prediv_table16,
480}; 480};
481 481
482static struct of_device_id clkgena_prediv_of_match[] = { 482static const struct of_device_id clkgena_prediv_of_match[] = {
483 { .compatible = "st,clkgena-prediv-c65", .data = &prediv_c65_data }, 483 { .compatible = "st,clkgena-prediv-c65", .data = &prediv_c65_data },
484 { .compatible = "st,clkgena-prediv-c32", .data = &prediv_c32_data }, 484 { .compatible = "st,clkgena-prediv-c32", .data = &prediv_c32_data },
485 {} 485 {}
@@ -586,7 +586,7 @@ static struct clkgen_mux_data stih407_a9_mux_data = {
586 .width = 2, 586 .width = 2,
587}; 587};
588 588
589static struct of_device_id mux_of_match[] = { 589static const struct of_device_id mux_of_match[] = {
590 { 590 {
591 .compatible = "st,stih416-clkgenc-vcc-hd", 591 .compatible = "st,stih416-clkgenc-vcc-hd",
592 .data = &clkgen_mux_c_vcc_hd_416, 592 .data = &clkgen_mux_c_vcc_hd_416,
@@ -693,7 +693,7 @@ static struct clkgen_vcc_data st_clkgenf_vcc_416 = {
693 .lock = &clkgenf_lock, 693 .lock = &clkgenf_lock,
694}; 694};
695 695
696static struct of_device_id vcc_of_match[] = { 696static const struct of_device_id vcc_of_match[] = {
697 { .compatible = "st,stih416-clkgenc", .data = &st_clkgenc_vcc_416 }, 697 { .compatible = "st,stih416-clkgenc", .data = &st_clkgenc_vcc_416 },
698 { .compatible = "st,stih416-clkgenf", .data = &st_clkgenf_vcc_416 }, 698 { .compatible = "st,stih416-clkgenf", .data = &st_clkgenf_vcc_416 },
699 {} 699 {}
diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c
index 29769d79e306..d204ba85db3a 100644
--- a/drivers/clk/st/clkgen-pll.c
+++ b/drivers/clk/st/clkgen-pll.c
@@ -593,7 +593,7 @@ static struct clk * __init clkgen_odf_register(const char *parent_name,
593 return clk; 593 return clk;
594} 594}
595 595
596static struct of_device_id c32_pll_of_match[] = { 596static const struct of_device_id c32_pll_of_match[] = {
597 { 597 {
598 .compatible = "st,plls-c32-a1x-0", 598 .compatible = "st,plls-c32-a1x-0",
599 .data = &st_pll3200c32_a1x_0, 599 .data = &st_pll3200c32_a1x_0,
@@ -708,7 +708,7 @@ err:
708} 708}
709CLK_OF_DECLARE(clkgen_c32_pll, "st,clkgen-plls-c32", clkgen_c32_pll_setup); 709CLK_OF_DECLARE(clkgen_c32_pll, "st,clkgen-plls-c32", clkgen_c32_pll_setup);
710 710
711static struct of_device_id c32_gpu_pll_of_match[] = { 711static const struct of_device_id c32_gpu_pll_of_match[] = {
712 { 712 {
713 .compatible = "st,stih415-gpu-pll-c32", 713 .compatible = "st,stih415-gpu-pll-c32",
714 .data = &st_pll1200c32_gpu_415, 714 .data = &st_pll1200c32_gpu_415,
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c
index 59bb4b39d12e..d86bc46b93bd 100644
--- a/drivers/clk/ti/clk-dra7-atl.c
+++ b/drivers/clk/ti/clk-dra7-atl.c
@@ -294,7 +294,7 @@ static int of_dra7_atl_clk_remove(struct platform_device *pdev)
294 return 0; 294 return 0;
295} 295}
296 296
297static struct of_device_id of_dra7_atl_clk_match_tbl[] = { 297static const struct of_device_id of_dra7_atl_clk_match_tbl[] = {
298 { .compatible = "ti,dra7-atl", }, 298 { .compatible = "ti,dra7-atl", },
299 {}, 299 {},
300}; 300};
diff --git a/drivers/clk/ti/clockdomain.c b/drivers/clk/ti/clockdomain.c
index b4c5faccaece..35fe1085480c 100644
--- a/drivers/clk/ti/clockdomain.c
+++ b/drivers/clk/ti/clockdomain.c
@@ -52,7 +52,7 @@ static void __init of_ti_clockdomain_setup(struct device_node *node)
52 } 52 }
53} 53}
54 54
55static struct of_device_id ti_clkdm_match_table[] __initdata = { 55static const struct of_device_id ti_clkdm_match_table[] __initconst = {
56 { .compatible = "ti,clockdomain" }, 56 { .compatible = "ti,clockdomain" },
57 { } 57 { }
58}; 58};
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index 765f1e0eeeb2..89c0609e180b 100644
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -110,7 +110,7 @@ static int vexpress_osc_probe(struct platform_device *pdev)
110 return 0; 110 return 0;
111} 111}
112 112
113static struct of_device_id vexpress_osc_of_match[] = { 113static const struct of_device_id vexpress_osc_of_match[] = {
114 { .compatible = "arm,vexpress-osc", }, 114 { .compatible = "arm,vexpress-osc", },
115 {} 115 {}
116}; 116};