diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-07 17:45:28 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-07 17:45:28 -0500 |
commit | 62f383435932ea3d271bee6b957de048452c1b16 (patch) | |
tree | 4e5c886224d9b54d69f5c50d55f8a7b63e2ab4cc /arch/arm/mach-s5pc100 | |
parent | 4d02be5a6550ebf09936802c2cb8d359ce1ab29c (diff) | |
parent | 60571f98d292b74586ff8330d8bc965eb01e8df0 (diff) |
Merge branch 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
* 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: use static declaration when it is not used in other files
ARM: S5PV210: use static declaration when it is not used in other files
ARM: S5PC100: use static declaration when it is not used in other files
ARM: S5P64X0: use static declaration when it is not used in other files
ARM: S3C64XX: use static declaration when it is not used in other files
ARM: S3C24XX: use static declaration when it is not used in other files
ARM: EXYNOS: use static declaration when it is not used in other files
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/clock.c | 28 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/dma.c | 16 |
2 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 247194dd366..16eca4ea201 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c | |||
@@ -170,7 +170,7 @@ static struct clk *clk_src_mout_am_list[] = { | |||
170 | [1] = &clk_div_apll2.clk, | 170 | [1] = &clk_div_apll2.clk, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | struct clksrc_sources clk_src_mout_am = { | 173 | static struct clksrc_sources clk_src_mout_am = { |
174 | .sources = clk_src_mout_am_list, | 174 | .sources = clk_src_mout_am_list, |
175 | .nr_sources = ARRAY_SIZE(clk_src_mout_am_list), | 175 | .nr_sources = ARRAY_SIZE(clk_src_mout_am_list), |
176 | }; | 176 | }; |
@@ -212,7 +212,7 @@ static struct clk *clk_src_mout_onenand_list[] = { | |||
212 | [1] = &clk_div_d1_bus.clk, | 212 | [1] = &clk_div_d1_bus.clk, |
213 | }; | 213 | }; |
214 | 214 | ||
215 | struct clksrc_sources clk_src_mout_onenand = { | 215 | static struct clksrc_sources clk_src_mout_onenand = { |
216 | .sources = clk_src_mout_onenand_list, | 216 | .sources = clk_src_mout_onenand_list, |
217 | .nr_sources = ARRAY_SIZE(clk_src_mout_onenand_list), | 217 | .nr_sources = ARRAY_SIZE(clk_src_mout_onenand_list), |
218 | }; | 218 | }; |
@@ -756,7 +756,7 @@ static struct clk *clk_src_group1_list[] = { | |||
756 | [3] = &clk_mout_hpll.clk, | 756 | [3] = &clk_mout_hpll.clk, |
757 | }; | 757 | }; |
758 | 758 | ||
759 | struct clksrc_sources clk_src_group1 = { | 759 | static struct clksrc_sources clk_src_group1 = { |
760 | .sources = clk_src_group1_list, | 760 | .sources = clk_src_group1_list, |
761 | .nr_sources = ARRAY_SIZE(clk_src_group1_list), | 761 | .nr_sources = ARRAY_SIZE(clk_src_group1_list), |
762 | }; | 762 | }; |
@@ -766,7 +766,7 @@ static struct clk *clk_src_group2_list[] = { | |||
766 | [1] = &clk_div_mpll.clk, | 766 | [1] = &clk_div_mpll.clk, |
767 | }; | 767 | }; |
768 | 768 | ||
769 | struct clksrc_sources clk_src_group2 = { | 769 | static struct clksrc_sources clk_src_group2 = { |
770 | .sources = clk_src_group2_list, | 770 | .sources = clk_src_group2_list, |
771 | .nr_sources = ARRAY_SIZE(clk_src_group2_list), | 771 | .nr_sources = ARRAY_SIZE(clk_src_group2_list), |
772 | }; | 772 | }; |
@@ -780,7 +780,7 @@ static struct clk *clk_src_group3_list[] = { | |||
780 | [5] = &clk_mout_hpll.clk, | 780 | [5] = &clk_mout_hpll.clk, |
781 | }; | 781 | }; |
782 | 782 | ||
783 | struct clksrc_sources clk_src_group3 = { | 783 | static struct clksrc_sources clk_src_group3 = { |
784 | .sources = clk_src_group3_list, | 784 | .sources = clk_src_group3_list, |
785 | .nr_sources = ARRAY_SIZE(clk_src_group3_list), | 785 | .nr_sources = ARRAY_SIZE(clk_src_group3_list), |
786 | }; | 786 | }; |
@@ -806,7 +806,7 @@ static struct clk *clk_src_group4_list[] = { | |||
806 | [5] = &clk_mout_hpll.clk, | 806 | [5] = &clk_mout_hpll.clk, |
807 | }; | 807 | }; |
808 | 808 | ||
809 | struct clksrc_sources clk_src_group4 = { | 809 | static struct clksrc_sources clk_src_group4 = { |
810 | .sources = clk_src_group4_list, | 810 | .sources = clk_src_group4_list, |
811 | .nr_sources = ARRAY_SIZE(clk_src_group4_list), | 811 | .nr_sources = ARRAY_SIZE(clk_src_group4_list), |
812 | }; | 812 | }; |
@@ -831,7 +831,7 @@ static struct clk *clk_src_group5_list[] = { | |||
831 | [4] = &clk_mout_hpll.clk, | 831 | [4] = &clk_mout_hpll.clk, |
832 | }; | 832 | }; |
833 | 833 | ||
834 | struct clksrc_sources clk_src_group5 = { | 834 | static struct clksrc_sources clk_src_group5 = { |
835 | .sources = clk_src_group5_list, | 835 | .sources = clk_src_group5_list, |
836 | .nr_sources = ARRAY_SIZE(clk_src_group5_list), | 836 | .nr_sources = ARRAY_SIZE(clk_src_group5_list), |
837 | }; | 837 | }; |
@@ -854,7 +854,7 @@ static struct clk *clk_src_group6_list[] = { | |||
854 | [2] = &clk_div_hdmi.clk, | 854 | [2] = &clk_div_hdmi.clk, |
855 | }; | 855 | }; |
856 | 856 | ||
857 | struct clksrc_sources clk_src_group6 = { | 857 | static struct clksrc_sources clk_src_group6 = { |
858 | .sources = clk_src_group6_list, | 858 | .sources = clk_src_group6_list, |
859 | .nr_sources = ARRAY_SIZE(clk_src_group6_list), | 859 | .nr_sources = ARRAY_SIZE(clk_src_group6_list), |
860 | }; | 860 | }; |
@@ -866,7 +866,7 @@ static struct clk *clk_src_group7_list[] = { | |||
866 | [3] = &clk_vclk54m, | 866 | [3] = &clk_vclk54m, |
867 | }; | 867 | }; |
868 | 868 | ||
869 | struct clksrc_sources clk_src_group7 = { | 869 | static struct clksrc_sources clk_src_group7 = { |
870 | .sources = clk_src_group7_list, | 870 | .sources = clk_src_group7_list, |
871 | .nr_sources = ARRAY_SIZE(clk_src_group7_list), | 871 | .nr_sources = ARRAY_SIZE(clk_src_group7_list), |
872 | }; | 872 | }; |
@@ -877,7 +877,7 @@ static struct clk *clk_src_mmc0_list[] = { | |||
877 | [2] = &clk_fin_epll, | 877 | [2] = &clk_fin_epll, |
878 | }; | 878 | }; |
879 | 879 | ||
880 | struct clksrc_sources clk_src_mmc0 = { | 880 | static struct clksrc_sources clk_src_mmc0 = { |
881 | .sources = clk_src_mmc0_list, | 881 | .sources = clk_src_mmc0_list, |
882 | .nr_sources = ARRAY_SIZE(clk_src_mmc0_list), | 882 | .nr_sources = ARRAY_SIZE(clk_src_mmc0_list), |
883 | }; | 883 | }; |
@@ -889,7 +889,7 @@ static struct clk *clk_src_mmc12_list[] = { | |||
889 | [3] = &clk_mout_hpll.clk, | 889 | [3] = &clk_mout_hpll.clk, |
890 | }; | 890 | }; |
891 | 891 | ||
892 | struct clksrc_sources clk_src_mmc12 = { | 892 | static struct clksrc_sources clk_src_mmc12 = { |
893 | .sources = clk_src_mmc12_list, | 893 | .sources = clk_src_mmc12_list, |
894 | .nr_sources = ARRAY_SIZE(clk_src_mmc12_list), | 894 | .nr_sources = ARRAY_SIZE(clk_src_mmc12_list), |
895 | }; | 895 | }; |
@@ -901,7 +901,7 @@ static struct clk *clk_src_irda_usb_list[] = { | |||
901 | [3] = &clk_mout_hpll.clk, | 901 | [3] = &clk_mout_hpll.clk, |
902 | }; | 902 | }; |
903 | 903 | ||
904 | struct clksrc_sources clk_src_irda_usb = { | 904 | static struct clksrc_sources clk_src_irda_usb = { |
905 | .sources = clk_src_irda_usb_list, | 905 | .sources = clk_src_irda_usb_list, |
906 | .nr_sources = ARRAY_SIZE(clk_src_irda_usb_list), | 906 | .nr_sources = ARRAY_SIZE(clk_src_irda_usb_list), |
907 | }; | 907 | }; |
@@ -912,7 +912,7 @@ static struct clk *clk_src_pwi_list[] = { | |||
912 | [2] = &clk_div_mpll.clk, | 912 | [2] = &clk_div_mpll.clk, |
913 | }; | 913 | }; |
914 | 914 | ||
915 | struct clksrc_sources clk_src_pwi = { | 915 | static struct clksrc_sources clk_src_pwi = { |
916 | .sources = clk_src_pwi_list, | 916 | .sources = clk_src_pwi_list, |
917 | .nr_sources = ARRAY_SIZE(clk_src_pwi_list), | 917 | .nr_sources = ARRAY_SIZE(clk_src_pwi_list), |
918 | }; | 918 | }; |
@@ -923,7 +923,7 @@ static struct clk *clk_sclk_spdif_list[] = { | |||
923 | [2] = &clk_sclk_audio2.clk, | 923 | [2] = &clk_sclk_audio2.clk, |
924 | }; | 924 | }; |
925 | 925 | ||
926 | struct clksrc_sources clk_src_sclk_spdif = { | 926 | static struct clksrc_sources clk_src_sclk_spdif = { |
927 | .sources = clk_sclk_spdif_list, | 927 | .sources = clk_sclk_spdif_list, |
928 | .nr_sources = ARRAY_SIZE(clk_sclk_spdif_list), | 928 | .nr_sources = ARRAY_SIZE(clk_sclk_spdif_list), |
929 | }; | 929 | }; |
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c index 96b1ab3dcd4..afd8db2d599 100644 --- a/arch/arm/mach-s5pc100/dma.c +++ b/arch/arm/mach-s5pc100/dma.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | static u64 dma_dmamask = DMA_BIT_MASK(32); | 36 | static u64 dma_dmamask = DMA_BIT_MASK(32); |
37 | 37 | ||
38 | u8 pdma0_peri[] = { | 38 | static u8 pdma0_peri[] = { |
39 | DMACH_UART0_RX, | 39 | DMACH_UART0_RX, |
40 | DMACH_UART0_TX, | 40 | DMACH_UART0_TX, |
41 | DMACH_UART1_RX, | 41 | DMACH_UART1_RX, |
@@ -68,15 +68,15 @@ u8 pdma0_peri[] = { | |||
68 | DMACH_HSI_TX, | 68 | DMACH_HSI_TX, |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct dma_pl330_platdata s5pc100_pdma0_pdata = { | 71 | static struct dma_pl330_platdata s5pc100_pdma0_pdata = { |
72 | .nr_valid_peri = ARRAY_SIZE(pdma0_peri), | 72 | .nr_valid_peri = ARRAY_SIZE(pdma0_peri), |
73 | .peri_id = pdma0_peri, | 73 | .peri_id = pdma0_peri, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | AMBA_AHB_DEVICE(s5pc100_pdma0, "dma-pl330.0", 0x00041330, S5PC100_PA_PDMA0, | 76 | static AMBA_AHB_DEVICE(s5pc100_pdma0, "dma-pl330.0", 0x00041330, |
77 | {IRQ_PDMA0}, &s5pc100_pdma0_pdata); | 77 | S5PC100_PA_PDMA0, {IRQ_PDMA0}, &s5pc100_pdma0_pdata); |
78 | 78 | ||
79 | u8 pdma1_peri[] = { | 79 | static u8 pdma1_peri[] = { |
80 | DMACH_UART0_RX, | 80 | DMACH_UART0_RX, |
81 | DMACH_UART0_TX, | 81 | DMACH_UART0_TX, |
82 | DMACH_UART1_RX, | 82 | DMACH_UART1_RX, |
@@ -109,13 +109,13 @@ u8 pdma1_peri[] = { | |||
109 | DMACH_MSM_REQ3, | 109 | DMACH_MSM_REQ3, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct dma_pl330_platdata s5pc100_pdma1_pdata = { | 112 | static struct dma_pl330_platdata s5pc100_pdma1_pdata = { |
113 | .nr_valid_peri = ARRAY_SIZE(pdma1_peri), | 113 | .nr_valid_peri = ARRAY_SIZE(pdma1_peri), |
114 | .peri_id = pdma1_peri, | 114 | .peri_id = pdma1_peri, |
115 | }; | 115 | }; |
116 | 116 | ||
117 | AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330, S5PC100_PA_PDMA1, | 117 | static AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330, |
118 | {IRQ_PDMA1}, &s5pc100_pdma1_pdata); | 118 | S5PC100_PA_PDMA1, {IRQ_PDMA1}, &s5pc100_pdma1_pdata); |
119 | 119 | ||
120 | static int __init s5pc100_dma_init(void) | 120 | static int __init s5pc100_dma_init(void) |
121 | { | 121 | { |