diff options
author | Ryan Mallon <ryan@bluewatersys.com> | 2011-05-20 03:34:20 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 17:32:42 -0400 |
commit | f6558bf92aed978a81514131e408326f25046137 (patch) | |
tree | 71060f65b72cedc859af89b65f278192d1e38f9f /arch/arm/mach-spear3xx | |
parent | 66b848e487ab8655815437993951ee26cc3c593f (diff) |
ARM: 6928/1: SPEAr3xx: Make local shirq structures static
Several structures in arch/arm/mach-spear3xx are not marked static
like they should be. Fix this.
Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx')
-rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index 2697e65adf86..3d749da0b826 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c | |||
@@ -371,7 +371,7 @@ struct pmx_driver pmx_driver = { | |||
371 | }; | 371 | }; |
372 | 372 | ||
373 | /* spear3xx shared irq */ | 373 | /* spear3xx shared irq */ |
374 | struct shirq_dev_config shirq_ras1_config[] = { | 374 | static struct shirq_dev_config shirq_ras1_config[] = { |
375 | { | 375 | { |
376 | .virq = VIRQ_IT_PERS_S, | 376 | .virq = VIRQ_IT_PERS_S, |
377 | .enb_mask = IT_PERS_S_IRQ_MASK, | 377 | .enb_mask = IT_PERS_S_IRQ_MASK, |
@@ -411,7 +411,7 @@ struct shirq_dev_config shirq_ras1_config[] = { | |||
411 | }, | 411 | }, |
412 | }; | 412 | }; |
413 | 413 | ||
414 | struct spear_shirq shirq_ras1 = { | 414 | static struct spear_shirq shirq_ras1 = { |
415 | .irq = IRQ_GEN_RAS_1, | 415 | .irq = IRQ_GEN_RAS_1, |
416 | .dev_config = shirq_ras1_config, | 416 | .dev_config = shirq_ras1_config, |
417 | .dev_count = ARRAY_SIZE(shirq_ras1_config), | 417 | .dev_count = ARRAY_SIZE(shirq_ras1_config), |
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 5c0a67b60c2a..e4fce3f1042c 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c | |||
@@ -140,7 +140,7 @@ struct pmx_driver pmx_driver = { | |||
140 | }; | 140 | }; |
141 | 141 | ||
142 | /* spear3xx shared irq */ | 142 | /* spear3xx shared irq */ |
143 | struct shirq_dev_config shirq_ras1_config[] = { | 143 | static struct shirq_dev_config shirq_ras1_config[] = { |
144 | { | 144 | { |
145 | .virq = VIRQ_SMII0, | 145 | .virq = VIRQ_SMII0, |
146 | .status_mask = SMII0_IRQ_MASK, | 146 | .status_mask = SMII0_IRQ_MASK, |
@@ -168,7 +168,7 @@ struct shirq_dev_config shirq_ras1_config[] = { | |||
168 | }, | 168 | }, |
169 | }; | 169 | }; |
170 | 170 | ||
171 | struct spear_shirq shirq_ras1 = { | 171 | static struct spear_shirq shirq_ras1 = { |
172 | .irq = IRQ_GEN_RAS_1, | 172 | .irq = IRQ_GEN_RAS_1, |
173 | .dev_config = shirq_ras1_config, | 173 | .dev_config = shirq_ras1_config, |
174 | .dev_count = ARRAY_SIZE(shirq_ras1_config), | 174 | .dev_count = ARRAY_SIZE(shirq_ras1_config), |
@@ -180,7 +180,7 @@ struct spear_shirq shirq_ras1 = { | |||
180 | }, | 180 | }, |
181 | }; | 181 | }; |
182 | 182 | ||
183 | struct shirq_dev_config shirq_ras2_config[] = { | 183 | static struct shirq_dev_config shirq_ras2_config[] = { |
184 | { | 184 | { |
185 | .virq = VIRQ_UART1, | 185 | .virq = VIRQ_UART1, |
186 | .status_mask = UART1_IRQ_MASK, | 186 | .status_mask = UART1_IRQ_MASK, |
@@ -199,7 +199,7 @@ struct shirq_dev_config shirq_ras2_config[] = { | |||
199 | }, | 199 | }, |
200 | }; | 200 | }; |
201 | 201 | ||
202 | struct spear_shirq shirq_ras2 = { | 202 | static struct spear_shirq shirq_ras2 = { |
203 | .irq = IRQ_GEN_RAS_2, | 203 | .irq = IRQ_GEN_RAS_2, |
204 | .dev_config = shirq_ras2_config, | 204 | .dev_config = shirq_ras2_config, |
205 | .dev_count = ARRAY_SIZE(shirq_ras2_config), | 205 | .dev_count = ARRAY_SIZE(shirq_ras2_config), |
@@ -211,14 +211,14 @@ struct spear_shirq shirq_ras2 = { | |||
211 | }, | 211 | }, |
212 | }; | 212 | }; |
213 | 213 | ||
214 | struct shirq_dev_config shirq_ras3_config[] = { | 214 | static struct shirq_dev_config shirq_ras3_config[] = { |
215 | { | 215 | { |
216 | .virq = VIRQ_EMI, | 216 | .virq = VIRQ_EMI, |
217 | .status_mask = EMI_IRQ_MASK, | 217 | .status_mask = EMI_IRQ_MASK, |
218 | }, | 218 | }, |
219 | }; | 219 | }; |
220 | 220 | ||
221 | struct spear_shirq shirq_ras3 = { | 221 | static struct spear_shirq shirq_ras3 = { |
222 | .irq = IRQ_GEN_RAS_3, | 222 | .irq = IRQ_GEN_RAS_3, |
223 | .dev_config = shirq_ras3_config, | 223 | .dev_config = shirq_ras3_config, |
224 | .dev_count = ARRAY_SIZE(shirq_ras3_config), | 224 | .dev_count = ARRAY_SIZE(shirq_ras3_config), |
@@ -230,7 +230,7 @@ struct spear_shirq shirq_ras3 = { | |||
230 | }, | 230 | }, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | struct shirq_dev_config shirq_intrcomm_ras_config[] = { | 233 | static struct shirq_dev_config shirq_intrcomm_ras_config[] = { |
234 | { | 234 | { |
235 | .virq = VIRQ_TDM_HDLC, | 235 | .virq = VIRQ_TDM_HDLC, |
236 | .status_mask = TDM_HDLC_IRQ_MASK, | 236 | .status_mask = TDM_HDLC_IRQ_MASK, |
@@ -243,7 +243,7 @@ struct shirq_dev_config shirq_intrcomm_ras_config[] = { | |||
243 | }, | 243 | }, |
244 | }; | 244 | }; |
245 | 245 | ||
246 | struct spear_shirq shirq_intrcomm_ras = { | 246 | static struct spear_shirq shirq_intrcomm_ras = { |
247 | .irq = IRQ_INTRCOMM_RAS_ARM, | 247 | .irq = IRQ_INTRCOMM_RAS_ARM, |
248 | .dev_config = shirq_intrcomm_ras_config, | 248 | .dev_config = shirq_intrcomm_ras_config, |
249 | .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config), | 249 | .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config), |
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index 741c1f414cbd..fc4598a46f5e 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c | |||
@@ -385,7 +385,7 @@ struct pmx_driver pmx_driver = { | |||
385 | }; | 385 | }; |
386 | 386 | ||
387 | /* spear3xx shared irq */ | 387 | /* spear3xx shared irq */ |
388 | struct shirq_dev_config shirq_ras1_config[] = { | 388 | static struct shirq_dev_config shirq_ras1_config[] = { |
389 | { | 389 | { |
390 | .virq = VIRQ_EMI, | 390 | .virq = VIRQ_EMI, |
391 | .status_mask = EMI_IRQ_MASK, | 391 | .status_mask = EMI_IRQ_MASK, |
@@ -401,7 +401,7 @@ struct shirq_dev_config shirq_ras1_config[] = { | |||
401 | }, | 401 | }, |
402 | }; | 402 | }; |
403 | 403 | ||
404 | struct spear_shirq shirq_ras1 = { | 404 | static struct spear_shirq shirq_ras1 = { |
405 | .irq = IRQ_GEN_RAS_1, | 405 | .irq = IRQ_GEN_RAS_1, |
406 | .dev_config = shirq_ras1_config, | 406 | .dev_config = shirq_ras1_config, |
407 | .dev_count = ARRAY_SIZE(shirq_ras1_config), | 407 | .dev_count = ARRAY_SIZE(shirq_ras1_config), |
@@ -414,7 +414,7 @@ struct spear_shirq shirq_ras1 = { | |||
414 | }, | 414 | }, |
415 | }; | 415 | }; |
416 | 416 | ||
417 | struct shirq_dev_config shirq_ras3_config[] = { | 417 | static struct shirq_dev_config shirq_ras3_config[] = { |
418 | { | 418 | { |
419 | .virq = VIRQ_PLGPIO, | 419 | .virq = VIRQ_PLGPIO, |
420 | .enb_mask = GPIO_IRQ_MASK, | 420 | .enb_mask = GPIO_IRQ_MASK, |
@@ -433,7 +433,7 @@ struct shirq_dev_config shirq_ras3_config[] = { | |||
433 | }, | 433 | }, |
434 | }; | 434 | }; |
435 | 435 | ||
436 | struct spear_shirq shirq_ras3 = { | 436 | static struct spear_shirq shirq_ras3 = { |
437 | .irq = IRQ_GEN_RAS_3, | 437 | .irq = IRQ_GEN_RAS_3, |
438 | .dev_config = shirq_ras3_config, | 438 | .dev_config = shirq_ras3_config, |
439 | .dev_count = ARRAY_SIZE(shirq_ras3_config), | 439 | .dev_count = ARRAY_SIZE(shirq_ras3_config), |
@@ -447,7 +447,7 @@ struct spear_shirq shirq_ras3 = { | |||
447 | }, | 447 | }, |
448 | }; | 448 | }; |
449 | 449 | ||
450 | struct shirq_dev_config shirq_intrcomm_ras_config[] = { | 450 | static struct shirq_dev_config shirq_intrcomm_ras_config[] = { |
451 | { | 451 | { |
452 | .virq = VIRQ_CANU, | 452 | .virq = VIRQ_CANU, |
453 | .status_mask = CAN_U_IRQ_MASK, | 453 | .status_mask = CAN_U_IRQ_MASK, |
@@ -495,7 +495,7 @@ struct shirq_dev_config shirq_intrcomm_ras_config[] = { | |||
495 | }, | 495 | }, |
496 | }; | 496 | }; |
497 | 497 | ||
498 | struct spear_shirq shirq_intrcomm_ras = { | 498 | static struct spear_shirq shirq_intrcomm_ras = { |
499 | .irq = IRQ_INTRCOMM_RAS_ARM, | 499 | .irq = IRQ_INTRCOMM_RAS_ARM, |
500 | .dev_config = shirq_intrcomm_ras_config, | 500 | .dev_config = shirq_intrcomm_ras_config, |
501 | .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config), | 501 | .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config), |