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-s5pv210 | |
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-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/dma.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c index f6885d247d14..86ce62f66190 100644 --- a/arch/arm/mach-s5pv210/dma.c +++ b/arch/arm/mach-s5pv210/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, |
@@ -66,15 +66,15 @@ u8 pdma0_peri[] = { | |||
66 | DMACH_SPDIF, | 66 | DMACH_SPDIF, |
67 | }; | 67 | }; |
68 | 68 | ||
69 | struct dma_pl330_platdata s5pv210_pdma0_pdata = { | 69 | static struct dma_pl330_platdata s5pv210_pdma0_pdata = { |
70 | .nr_valid_peri = ARRAY_SIZE(pdma0_peri), | 70 | .nr_valid_peri = ARRAY_SIZE(pdma0_peri), |
71 | .peri_id = pdma0_peri, | 71 | .peri_id = pdma0_peri, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330, S5PV210_PA_PDMA0, | 74 | static AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330, |
75 | {IRQ_PDMA0}, &s5pv210_pdma0_pdata); | 75 | S5PV210_PA_PDMA0, {IRQ_PDMA0}, &s5pv210_pdma0_pdata); |
76 | 76 | ||
77 | u8 pdma1_peri[] = { | 77 | static u8 pdma1_peri[] = { |
78 | DMACH_UART0_RX, | 78 | DMACH_UART0_RX, |
79 | DMACH_UART0_TX, | 79 | DMACH_UART0_TX, |
80 | DMACH_UART1_RX, | 80 | DMACH_UART1_RX, |
@@ -109,13 +109,13 @@ u8 pdma1_peri[] = { | |||
109 | DMACH_PCM2_TX, | 109 | DMACH_PCM2_TX, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct dma_pl330_platdata s5pv210_pdma1_pdata = { | 112 | static struct dma_pl330_platdata s5pv210_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(s5pv210_pdma1, "dma-pl330.1", 0x00041330, S5PV210_PA_PDMA1, | 117 | static AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330, |
118 | {IRQ_PDMA1}, &s5pv210_pdma1_pdata); | 118 | S5PV210_PA_PDMA1, {IRQ_PDMA1}, &s5pv210_pdma1_pdata); |
119 | 119 | ||
120 | static int __init s5pv210_dma_init(void) | 120 | static int __init s5pv210_dma_init(void) |
121 | { | 121 | { |
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index ff9152610439..2cf5ed75f390 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -844,7 +844,7 @@ static struct s5p_fimc_isp_info goni_camera_sensors[] = { | |||
844 | }, | 844 | }, |
845 | }; | 845 | }; |
846 | 846 | ||
847 | struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { | 847 | static struct s5p_platform_fimc goni_fimc_md_platdata __initdata = { |
848 | .isp_info = goni_camera_sensors, | 848 | .isp_info = goni_camera_sensors, |
849 | .num_clients = ARRAY_SIZE(goni_camera_sensors), | 849 | .num_clients = ARRAY_SIZE(goni_camera_sensors), |
850 | }; | 850 | }; |
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index dff9ea7b5bba..0933c8e1eb7b 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -140,7 +140,7 @@ static struct dm9000_plat_data smdkv210_dm9000_platdata = { | |||
140 | .dev_addr = { 0x00, 0x09, 0xc0, 0xff, 0xec, 0x48 }, | 140 | .dev_addr = { 0x00, 0x09, 0xc0, 0xff, 0xec, 0x48 }, |
141 | }; | 141 | }; |
142 | 142 | ||
143 | struct platform_device smdkv210_dm9000 = { | 143 | static struct platform_device smdkv210_dm9000 = { |
144 | .name = "dm9000", | 144 | .name = "dm9000", |
145 | .id = -1, | 145 | .id = -1, |
146 | .num_resources = ARRAY_SIZE(smdkv210_dm9000_resources), | 146 | .num_resources = ARRAY_SIZE(smdkv210_dm9000_resources), |