diff options
author | Sekhar Nori <nsekhar@ti.com> | 2009-03-23 15:19:27 +0530 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2009-09-09 14:03:22 -0400 |
commit | 9c393714e683d13b086ba26d60992a6ec2248c76 (patch) | |
tree | d9b41e717a11cf29dac2b1a04641ee27371a97cb /drivers | |
parent | 6a92c7e85e73f43f4153864895cd93f5e56d094e (diff) |
U-Boot: Fix compiler warnings
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/spi/spi_flash_internal.h | 3 | ||||
-rw-r--r-- | drivers/spi/davinci_spi.c | 10 | ||||
-rw-r--r-- | drivers/spi/davinci_spi.h | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 75f5900dc17..2d590c26095 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -43,4 +43,5 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, /* Manufacturer-specific probe functions */ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode); -struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode); +struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode); +struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode); diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index ed895212bd0..c961a671f7c 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -47,8 +47,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) { struct davinci_spi_slave *ds; - void *regs; - unsigned int fmt0; ds = malloc(sizeof(struct davinci_spi_slave)); if (!ds) @@ -56,7 +54,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, ds->slave.bus = bus; ds->slave.cs = cs; - ds->regs = CFG_SPI_BASE; + ds->regs = (void*) CFG_SPI_BASE; ds->freq = max_hz; return &ds->slave; @@ -128,14 +126,10 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { struct davinci_spi_slave *ds = to_davinci_spi(slave); - unsigned int len_tx; - unsigned int len_rx; unsigned int len; int ret, i; - u32 status; const u8 *txp = dout; u8 *rxp = din; - u8 value, dummy = 0; ret = 0; @@ -238,7 +232,7 @@ static char spirombuf[3]; /* ------------------------------------------------------------------------ * * spirom_status( ) * * ------------------------------------------------------------------------ */ -static unsigned char spi_get_status( ) +static unsigned char spi_get_status(void) { /* Issue read status command */ spirombuf[0] = SPIROM_CMD_RDSR; diff --git a/drivers/spi/davinci_spi.h b/drivers/spi/davinci_spi.h index 0f2b0877baa..16141648ed0 100644 --- a/drivers/spi/davinci_spi.h +++ b/drivers/spi/davinci_spi.h @@ -39,8 +39,8 @@ static inline struct davinci_spi_slave *to_davinci_spi(struct spi_slave *slave) return container_of(slave, struct davinci_spi_slave, slave); } -#define spi_readl(as, reg) \ - readl(CFG_SPI_BASE + DAVINCI_SPI_##reg) -#define spi_writel(as, reg, value) \ - writel(value, CFG_SPI_BASE + DAVINCI_SPI_##reg) +#define spi_readl(ds, reg) \ + readl(ds->regs + DAVINCI_SPI_##reg) +#define spi_writel(ds, reg, value) \ + writel(value, ds->regs + DAVINCI_SPI_##reg) |