diff options
| author | Jonas Gorski | 2013-03-12 00:13:45 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-03-12 20:14:47 +0100 |
| commit | c94df49542a9cf2c095468e62be6a16ba86dd811 (patch) | |
| tree | 143e763c38fa1dd74b1f558e02c81eaeb91acaf9 /drivers/spi/spi-bcm63xx.c | |
| parent | spi/bcm63xx: remove spi chip select validity check (diff) | |
| download | kernel-qcow2-linux-c94df49542a9cf2c095468e62be6a16ba86dd811.tar.gz kernel-qcow2-linux-c94df49542a9cf2c095468e62be6a16ba86dd811.tar.xz kernel-qcow2-linux-c94df49542a9cf2c095468e62be6a16ba86dd811.zip | |
spi/bcm63xx: inline bcm63xx_spi_check_transfer
It only does one check, so just do the check directly in the caller.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-bcm63xx.c')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 9574e47e4ff4..d777f6311100 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -93,18 +93,6 @@ static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = { { 391000, SPI_CLK_0_391MHZ } }; -static int bcm63xx_spi_check_transfer(struct spi_device *spi, - struct spi_transfer *t) -{ - if (t->bits_per_word != 8) { - dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", - __func__, t->bits_per_word); - return -EINVAL; - } - - return 0; -} - static void bcm63xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) { @@ -293,9 +281,12 @@ static int bcm63xx_spi_transfer_one(struct spi_master *master, * full-duplex transfers. */ list_for_each_entry(t, &m->transfers, transfer_list) { - status = bcm63xx_spi_check_transfer(spi, t); - if (status < 0) + if (t->bits_per_word != 8) { + dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", + __func__, t->bits_per_word); + status = -EINVAL; goto exit; + } if (!first) first = t; |