diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-10-20 07:23:15 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-18 22:53:46 -0500 |
commit | d1c925b22141b841060d8c1e3a9f9949a77cdc05 (patch) | |
tree | 310b60c09b62503cc9f2a760b47d9cd08ed15053 /arch | |
parent | 3ba09114a1cdca78e4578328ebc2fb6e910fe066 (diff) |
ARM: Kirkwood: Fix sparse warnings.
Mostly missing statics, but also missing include files
and void parameters.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/irq.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/lacie_v2-common.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/t5325-setup.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/tsx1x-common.c | 7 |
6 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index d94872fed8c0..6261e159f615 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c | |||
@@ -26,7 +26,7 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = { | |||
26 | { } | 26 | { } |
27 | }; | 27 | }; |
28 | 28 | ||
29 | struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { | 29 | static struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { |
30 | OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL), | 30 | OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL), |
31 | OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0", | 31 | OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0", |
32 | NULL), | 32 | NULL), |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 2c6c218fb79e..54e690dde9a0 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -425,7 +425,7 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data) | |||
425 | /***************************************************************************** | 425 | /***************************************************************************** |
426 | * SPI | 426 | * SPI |
427 | ****************************************************************************/ | 427 | ****************************************************************************/ |
428 | void __init kirkwood_spi_init() | 428 | void __init kirkwood_spi_init(void) |
429 | { | 429 | { |
430 | orion_spi_init(SPI_PHYS_BASE); | 430 | orion_spi_init(SPI_PHYS_BASE); |
431 | } | 431 | } |
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c index 884703535a0a..2a97a2e4163c 100644 --- a/arch/arm/mach-kirkwood/irq.c +++ b/arch/arm/mach-kirkwood/irq.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <mach/bridge-regs.h> | 14 | #include <mach/bridge-regs.h> |
15 | #include <plat/orion-gpio.h> | 15 | #include <plat/orion-gpio.h> |
16 | #include <plat/irq.h> | 16 | #include <plat/irq.h> |
17 | #include "common.h" | ||
17 | 18 | ||
18 | static int __initdata gpio0_irqs[4] = { | 19 | static int __initdata gpio0_irqs[4] = { |
19 | IRQ_KIRKWOOD_GPIO_LOW_0_7, | 20 | IRQ_KIRKWOOD_GPIO_LOW_0_7, |
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c index 285edab776e9..489495976fcd 100644 --- a/arch/arm/mach-kirkwood/lacie_v2-common.c +++ b/arch/arm/mach-kirkwood/lacie_v2-common.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <mach/irqs.h> | 19 | #include <mach/irqs.h> |
20 | #include <plat/time.h> | 20 | #include <plat/time.h> |
21 | #include "common.h" | 21 | #include "common.h" |
22 | #include "lacie_v2-common.h" | ||
22 | 23 | ||
23 | /***************************************************************************** | 24 | /***************************************************************************** |
24 | * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005) | 25 | * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005) |
diff --git a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c index bad738e44044..f2daf711e72e 100644 --- a/arch/arm/mach-kirkwood/t5325-setup.c +++ b/arch/arm/mach-kirkwood/t5325-setup.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "common.h" | 29 | #include "common.h" |
30 | #include "mpp.h" | 30 | #include "mpp.h" |
31 | 31 | ||
32 | struct mtd_partition hp_t5325_partitions[] = { | 32 | static struct mtd_partition hp_t5325_partitions[] = { |
33 | { | 33 | { |
34 | .name = "u-boot env", | 34 | .name = "u-boot env", |
35 | .size = SZ_64K, | 35 | .size = SZ_64K, |
@@ -59,14 +59,14 @@ struct mtd_partition hp_t5325_partitions[] = { | |||
59 | }, | 59 | }, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | const struct flash_platform_data hp_t5325_flash = { | 62 | static const struct flash_platform_data hp_t5325_flash = { |
63 | .type = "mx25l8005", | 63 | .type = "mx25l8005", |
64 | .name = "spi_flash", | 64 | .name = "spi_flash", |
65 | .parts = hp_t5325_partitions, | 65 | .parts = hp_t5325_partitions, |
66 | .nr_parts = ARRAY_SIZE(hp_t5325_partitions), | 66 | .nr_parts = ARRAY_SIZE(hp_t5325_partitions), |
67 | }; | 67 | }; |
68 | 68 | ||
69 | struct spi_board_info __initdata hp_t5325_spi_slave_info[] = { | 69 | static struct spi_board_info __initdata hp_t5325_spi_slave_info[] = { |
70 | { | 70 | { |
71 | .modalias = "m25p80", | 71 | .modalias = "m25p80", |
72 | .platform_data = &hp_t5325_flash, | 72 | .platform_data = &hp_t5325_flash, |
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c index 8943ede29b44..cec87cef76ca 100644 --- a/arch/arm/mach-kirkwood/tsx1x-common.c +++ b/arch/arm/mach-kirkwood/tsx1x-common.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/serial_reg.h> | 7 | #include <linux/serial_reg.h> |
8 | #include <mach/kirkwood.h> | 8 | #include <mach/kirkwood.h> |
9 | #include "common.h" | 9 | #include "common.h" |
10 | #include "tsx1x-common.h" | ||
10 | 11 | ||
11 | /* | 12 | /* |
12 | * QNAP TS-x1x Boards flash | 13 | * QNAP TS-x1x Boards flash |
@@ -29,7 +30,7 @@ | |||
29 | * | 30 | * |
30 | ***************************************************************************/ | 31 | ***************************************************************************/ |
31 | 32 | ||
32 | struct mtd_partition qnap_tsx1x_partitions[] = { | 33 | static struct mtd_partition qnap_tsx1x_partitions[] = { |
33 | { | 34 | { |
34 | .name = "U-Boot", | 35 | .name = "U-Boot", |
35 | .size = 0x00080000, | 36 | .size = 0x00080000, |
@@ -58,14 +59,14 @@ struct mtd_partition qnap_tsx1x_partitions[] = { | |||
58 | }, | 59 | }, |
59 | }; | 60 | }; |
60 | 61 | ||
61 | const struct flash_platform_data qnap_tsx1x_flash = { | 62 | static const struct flash_platform_data qnap_tsx1x_flash = { |
62 | .type = "m25p128", | 63 | .type = "m25p128", |
63 | .name = "spi_flash", | 64 | .name = "spi_flash", |
64 | .parts = qnap_tsx1x_partitions, | 65 | .parts = qnap_tsx1x_partitions, |
65 | .nr_parts = ARRAY_SIZE(qnap_tsx1x_partitions), | 66 | .nr_parts = ARRAY_SIZE(qnap_tsx1x_partitions), |
66 | }; | 67 | }; |
67 | 68 | ||
68 | struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = { | 69 | static struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = { |
69 | { | 70 | { |
70 | .modalias = "m25p80", | 71 | .modalias = "m25p80", |
71 | .platform_data = &qnap_tsx1x_flash, | 72 | .platform_data = &qnap_tsx1x_flash, |