diff options
| author | Tom Rini <trini@ti.com> | 2013-12-06 07:19:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-06 07:19:09 -0500 |
| commit | 3f56795635ab419d3378451a9291490cfa47f472 (patch) | |
| tree | 9043dbaf750f7c4fd2162d8d4a2ea480dfe71860 /drivers | |
| parent | 1df99080cb6dea9216ee1925f03bd7cc35dc34c7 (diff) | |
| parent | 985e18d14e0cb3933311945d30de6357cf8be9df (diff) | |
| download | blackbird-obmc-uboot-3f56795635ab419d3378451a9291490cfa47f472.tar.gz blackbird-obmc-uboot-3f56795635ab419d3378451a9291490cfa47f472.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/bfin_spi.c | 17 | ||||
| -rw-r--r-- | drivers/spi/bfin_spi6xx.c | 5 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index bb88f3008a..aa89d89a32 100644 --- a/drivers/spi/bfin_spi.c +++ b/drivers/spi/bfin_spi.c @@ -162,21 +162,22 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - if (bus >= ARRAY_SIZE(pins) || pins[bus] == NULL) { - debug("%s: invalid bus %u\n", __func__, bus); - return NULL; - } switch (bus) { #ifdef SPI0_CTL - case 0: mmr_base = SPI0_CTL; break; + case 0: + mmr_base = SPI0_CTL; break; #endif #ifdef SPI1_CTL - case 1: mmr_base = SPI1_CTL; break; + case 1: + mmr_base = SPI1_CTL; break; #endif #ifdef SPI2_CTL - case 2: mmr_base = SPI2_CTL; break; + case 2: + mmr_base = SPI2_CTL; break; #endif - default: return NULL; + default: + debug("%s: invalid bus %u\n", __func__, bus); + return NULL; } bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs); diff --git a/drivers/spi/bfin_spi6xx.c b/drivers/spi/bfin_spi6xx.c index c25c4a9aea..07b833d3a3 100644 --- a/drivers/spi/bfin_spi6xx.c +++ b/drivers/spi/bfin_spi6xx.c @@ -154,10 +154,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs)) return NULL; - if (bus >= ARRAY_SIZE(pins) || pins[bus] == NULL) { - debug("%s: invalid bus %u\n", __func__, bus); - return NULL; - } switch (bus) { #ifdef SPI0_REGBASE case 0: @@ -175,6 +171,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, break; #endif default: + debug("%s: invalid bus %u\n", __func__, bus); return NULL; } |
