Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42366666 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Orion5x: Fix warnings when using C=1. 



Add missing include files, missing static keyword, and use NULL instead
of 0, in order to fix warnings when compiling with C=1.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 48fce88c

arch/arm/mach-orion5x/board-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <plat/irq.h>

#include "common.h"



struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata orion5x_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),

arch/arm/mach-orion5x/common.c

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) 
/*****************************************************************************

 * SPI

 ****************************************************************************/

void __init orion5x_spi_init()

void __init orion5x_spi_init(void)

{

	orion_spi_init(SPI_PHYS_BASE);

}
@@ -185,7 +185,7 @@ static void __init orion5x_crypto_init(void) 
/*****************************************************************************

 * Watchdog

 ****************************************************************************/

void __init orion5x_wdt_init(void)

static void __init orion5x_wdt_init(void)

{

	orion_wdt_init();

}
@@ -246,7 +246,7 @@ void orion5x_setup_wins(void) 


int orion5x_tclk;



int __init orion5x_find_tclk(void)

static int __init orion5x_find_tclk(void)

{

	u32 dev, rev;

arch/arm/mach-orion5x/db88f5281-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ __initcall(db88f5281_7seg_init); 
 * PCI

 ****************************************************************************/



void __init db88f5281_pci_preinit(void)

static void __init db88f5281_pci_preinit(void)

{

	int pin;

arch/arm/mach-orion5x/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,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_ORION5X_GPIO_0_7,

arch/arm/mach-orion5x/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -240,11 +240,11 @@ static int __init pcie_setup(struct pci_sys_data *sys) 
#define PCI_BAR_SIZE_DDR_CS(n)	(((n) == 0) ? ORION5X_PCI_REG(0xc08) : \

				 ((n) == 1) ? ORION5X_PCI_REG(0xd08) : \

				 ((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \

				 ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0)

				 ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : NULL)

#define PCI_BAR_REMAP_DDR_CS(n)	(((n) == 0) ? ORION5X_PCI_REG(0xc48) : \

				 ((n) == 1) ? ORION5X_PCI_REG(0xd48) : \

				 ((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \

				 ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0)

				 ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : NULL)

#define PCI_BAR_ENABLE		ORION5X_PCI_REG(0xc3c)

#define PCI_ADDR_DECODE_CTRL	ORION5X_PCI_REG(0xd3c)