diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-04-13 08:34:26 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-04-13 08:34:26 -0400 |
commit | 8c3d4534a8da0dc6a2d52b61585e61f7e8143096 (patch) | |
tree | 40da52d96347d6f44e540e24c04455dfb726ac29 /arch/arm | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) |
ARM: OMAP2+: declare file-local functions as static
Several function declarations used only in the files in which they're
declared should include the static keyword, but don't:
arch/arm/mach-omap2/serial.c:248:6: warning: symbol 'cmdline_find_option' was not declared. Should it be static?
arch/arm/mach-omap2/omap-wakeupgen.c:259:6: warning: symbol 'irq_sar_clear' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-peripherals.c:878:27: warning: symbol 'rx51_vibra_data' was not declared. Should it be static?
arch/arm/mach-omap2/board-rx51-peripherals.c:882:27: warning: symbol 'rx51_audio_data' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap4panda.c:201:29: warning: symbol 'omap_panda_wlan_data' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap4panda.c:393:24: warning: symbol 'omap4_panda_dvi_device' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap4panda.c:403:12: warning: symbol 'omap4_panda_dvi_init' was not declared. Should it be static?
arch/arm/mach-omap2/board-omap4panda.c:464:6: warning: symbol 'omap4_panda_display_init' was not declared. Should it be static?
arch/arm/mach-omap2/hsmmc.c:434:6: warning: symbol 'omap_init_hsmmc' was not declared. Should it be static?
arch/arm/mach-omap2/hwspinlock.c:31:12: warning: symbol 'hwspinlocks_init' was not declared. Should it be static?
arch/arm/mach-omap1/timer.c:58:12: warning: symbol 'omap1_dm_timer_init' was not declared. Should it be static?
arch/arm/mach-omap1/fpga.c:90:6: warning: symbol 'innovator_fpga_IRQ_demux' was not declared. Should it be static?
Mark all of these as static.
Thanks to Arnd Bergmann <arnd@arndb.de> for pointing out a typo in the
original patch description.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Govindraj R <govindraj.raja@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: David Anders <x0132446@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap1/fpga.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/timer.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/hwspinlock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-wakeupgen.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 76c67b3f9f61..29ec50fc688d 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -87,7 +87,7 @@ static void fpga_mask_ack_irq(struct irq_data *d) | |||
87 | fpga_ack_irq(d); | 87 | fpga_ack_irq(d); |
88 | } | 88 | } |
89 | 89 | ||
90 | void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc) | 90 | static void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc) |
91 | { | 91 | { |
92 | u32 stat; | 92 | u32 stat; |
93 | int fpga_irq; | 93 | int fpga_irq; |
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c index 6e90665a7c47..5536e0456fb7 100644 --- a/arch/arm/mach-omap1/timer.c +++ b/arch/arm/mach-omap1/timer.c | |||
@@ -54,8 +54,7 @@ static int omap1_dm_timer_set_src(struct platform_device *pdev, | |||
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | static int __init omap1_dm_timer_init(void) | |
58 | int __init omap1_dm_timer_init(void) | ||
59 | { | 58 | { |
60 | int i; | 59 | int i; |
61 | int ret; | 60 | int ret; |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index d8c0e89f0126..f864065cc1fe 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -230,7 +230,7 @@ static struct platform_device omap_vwlan_device = { | |||
230 | }, | 230 | }, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | struct wl12xx_platform_data omap_panda_wlan_data __initdata = { | 233 | static struct wl12xx_platform_data omap_panda_wlan_data __initdata = { |
234 | /* PANDA ref clock is 38.4 MHz */ | 234 | /* PANDA ref clock is 38.4 MHz */ |
235 | .board_ref_clock = 2, | 235 | .board_ref_clock = 2, |
236 | }; | 236 | }; |
@@ -439,7 +439,7 @@ static struct panel_dvi_platform_data omap4_dvi_panel = { | |||
439 | .i2c_bus_num = 3, | 439 | .i2c_bus_num = 3, |
440 | }; | 440 | }; |
441 | 441 | ||
442 | struct omap_dss_device omap4_panda_dvi_device = { | 442 | static struct omap_dss_device omap4_panda_dvi_device = { |
443 | .type = OMAP_DISPLAY_TYPE_DPI, | 443 | .type = OMAP_DISPLAY_TYPE_DPI, |
444 | .name = "dvi", | 444 | .name = "dvi", |
445 | .driver_name = "dvi", | 445 | .driver_name = "dvi", |
@@ -449,7 +449,7 @@ struct omap_dss_device omap4_panda_dvi_device = { | |||
449 | .channel = OMAP_DSS_CHANNEL_LCD2, | 449 | .channel = OMAP_DSS_CHANNEL_LCD2, |
450 | }; | 450 | }; |
451 | 451 | ||
452 | int __init omap4_panda_dvi_init(void) | 452 | static int __init omap4_panda_dvi_init(void) |
453 | { | 453 | { |
454 | int r; | 454 | int r; |
455 | 455 | ||
@@ -510,7 +510,7 @@ static struct omap_dss_board_info omap4_panda_dss_data = { | |||
510 | .default_device = &omap4_panda_dvi_device, | 510 | .default_device = &omap4_panda_dvi_device, |
511 | }; | 511 | }; |
512 | 512 | ||
513 | void __init omap4_panda_display_init(void) | 513 | static void __init omap4_panda_display_init(void) |
514 | { | 514 | { |
515 | int r; | 515 | int r; |
516 | 516 | ||
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index d87ee0612098..ae957c92081b 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -872,11 +872,11 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { | |||
872 | .resource_config = twl4030_rconfig, | 872 | .resource_config = twl4030_rconfig, |
873 | }; | 873 | }; |
874 | 874 | ||
875 | struct twl4030_vibra_data rx51_vibra_data __initdata = { | 875 | static struct twl4030_vibra_data rx51_vibra_data __initdata = { |
876 | .coexist = 0, | 876 | .coexist = 0, |
877 | }; | 877 | }; |
878 | 878 | ||
879 | struct twl4030_audio_data rx51_audio_data __initdata = { | 879 | static struct twl4030_audio_data rx51_audio_data __initdata = { |
880 | .audio_mclk = 26000000, | 880 | .audio_mclk = 26000000, |
881 | .vibra = &rx51_vibra_data, | 881 | .vibra = &rx51_vibra_data, |
882 | }; | 882 | }; |
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c index 454dfce125ca..8763c8520dc2 100644 --- a/arch/arm/mach-omap2/hwspinlock.c +++ b/arch/arm/mach-omap2/hwspinlock.c | |||
@@ -28,7 +28,7 @@ static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = { | |||
28 | .base_id = 0, | 28 | .base_id = 0, |
29 | }; | 29 | }; |
30 | 30 | ||
31 | int __init hwspinlocks_init(void) | 31 | static int __init hwspinlocks_init(void) |
32 | { | 32 | { |
33 | int retval = 0; | 33 | int retval = 0; |
34 | struct omap_hwmod *oh; | 34 | struct omap_hwmod *oh; |
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 42cd7fb52414..d811c7790350 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c | |||
@@ -259,7 +259,7 @@ static void irq_save_context(void) | |||
259 | /* | 259 | /* |
260 | * Clear WakeupGen SAR backup status. | 260 | * Clear WakeupGen SAR backup status. |
261 | */ | 261 | */ |
262 | void irq_sar_clear(void) | 262 | static void irq_sar_clear(void) |
263 | { | 263 | { |
264 | u32 val; | 264 | u32 val; |
265 | val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET); | 265 | val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET); |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 0cdd359a128e..8d22e29d8293 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -243,7 +243,7 @@ static void omap_serial_fill_default_pads(struct omap_board_data *bdata) | |||
243 | static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} | 243 | static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} |
244 | #endif | 244 | #endif |
245 | 245 | ||
246 | char *cmdline_find_option(char *str) | 246 | static char *cmdline_find_option(char *str) |
247 | { | 247 | { |
248 | extern char *saved_command_line; | 248 | extern char *saved_command_line; |
249 | 249 | ||