Skip to content

Commit

Permalink
ARM: Kirkwood: Fix sparse warnings.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed Nov 19, 2012
1 parent 3ba0911 commit d1c925b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-kirkwood/board-dt.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
{ }
};

struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
static struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",
NULL),
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-kirkwood/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data)
/*****************************************************************************
* SPI
****************************************************************************/
void __init kirkwood_spi_init()
void __init kirkwood_spi_init(void)
{
orion_spi_init(SPI_PHYS_BASE);
}
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-kirkwood/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <mach/bridge-regs.h>
#include <plat/orion-gpio.h>
#include <plat/irq.h>
#include "common.h"

static int __initdata gpio0_irqs[4] = {
IRQ_KIRKWOOD_GPIO_LOW_0_7,
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-kirkwood/lacie_v2-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <mach/irqs.h>
#include <plat/time.h>
#include "common.h"
#include "lacie_v2-common.h"

/*****************************************************************************
* 512KB SPI Flash on Boot Device (MACRONIX MX25L4005)
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-kirkwood/t5325-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "common.h"
#include "mpp.h"

struct mtd_partition hp_t5325_partitions[] = {
static struct mtd_partition hp_t5325_partitions[] = {
{
.name = "u-boot env",
.size = SZ_64K,
Expand Down Expand Up @@ -59,14 +59,14 @@ struct mtd_partition hp_t5325_partitions[] = {
},
};

const struct flash_platform_data hp_t5325_flash = {
static const struct flash_platform_data hp_t5325_flash = {
.type = "mx25l8005",
.name = "spi_flash",
.parts = hp_t5325_partitions,
.nr_parts = ARRAY_SIZE(hp_t5325_partitions),
};

struct spi_board_info __initdata hp_t5325_spi_slave_info[] = {
static struct spi_board_info __initdata hp_t5325_spi_slave_info[] = {
{
.modalias = "m25p80",
.platform_data = &hp_t5325_flash,
Expand Down
7 changes: 4 additions & 3 deletions arch/arm/mach-kirkwood/tsx1x-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <linux/serial_reg.h>
#include <mach/kirkwood.h>
#include "common.h"
#include "tsx1x-common.h"

/*
* QNAP TS-x1x Boards flash
Expand All @@ -29,7 +30,7 @@
*
***************************************************************************/

struct mtd_partition qnap_tsx1x_partitions[] = {
static struct mtd_partition qnap_tsx1x_partitions[] = {
{
.name = "U-Boot",
.size = 0x00080000,
Expand Down Expand Up @@ -58,14 +59,14 @@ struct mtd_partition qnap_tsx1x_partitions[] = {
},
};

const struct flash_platform_data qnap_tsx1x_flash = {
static const struct flash_platform_data qnap_tsx1x_flash = {
.type = "m25p128",
.name = "spi_flash",
.parts = qnap_tsx1x_partitions,
.nr_parts = ARRAY_SIZE(qnap_tsx1x_partitions),
};

struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = {
static struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = {
{
.modalias = "m25p80",
.platform_data = &qnap_tsx1x_flash,
Expand Down

0 comments on commit d1c925b

Please sign in to comment.