diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-12-02 12:57:33 +0800 |
|---|---|---|
| committer | Sonic Zhang <sonic.zhang@analog.com> | 2013-12-06 16:06:51 +0800 |
| commit | 727cbe14b25b492bc9b96ad9d1f5f881d833028e (patch) | |
| tree | 447918578ff843a942c4053229c0e3e033c1969a | |
| parent | e5cb60a033502ab24fef15fa005835b2e46f90eb (diff) | |
| download | u-boot-imx-727cbe14b25b492bc9b96ad9d1f5f881d833028e.zip u-boot-imx-727cbe14b25b492bc9b96ad9d1f5f881d833028e.tar.gz u-boot-imx-727cbe14b25b492bc9b96ad9d1f5f881d833028e.tar.bz2 | |
spi: bfin_spi: Remove unnecessary test for bus and pins[bus]
For invalid bus number, current code returns NULL in the default case of
switch-case statements. In additional, pins[bus] is always not NULL because
it is the address of specific row of the two-dimensional array.
Thus this patch removes these unnecessary test.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
| -rw-r--r-- | drivers/spi/bfin_spi.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c index bb88f30..aa89d89 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); |