spi/bcm63xx: simplify bcm63xx_spi_check_transfer
authorJonas Gorski <jogo@openwrt.org>
Mon, 11 Mar 2013 23:13:43 +0000 (00:13 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 12 Mar 2013 19:14:46 +0000 (19:14 +0000)
bcm63xx_spi_check_transfer is only called from one place that has
t always set, so directly check the transfer's bits_per_word.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/spi/spi-bcm63xx.c

index b64229ca7f54e5ccde180cb1975fc2f2a9428019..b9c9431286e4bfbe0c9ee1de73917e2777035f30 100644 (file)
@@ -96,12 +96,9 @@ static const unsigned bcm63xx_spi_freq_table[SPI_CLK_MASK][2] = {
 static int bcm63xx_spi_check_transfer(struct spi_device *spi,
                                        struct spi_transfer *t)
 {
-       u8 bits_per_word;
-
-       bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
-       if (bits_per_word != 8) {
+       if (t->bits_per_word != 8) {
                dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-                       __func__, bits_per_word);
+                       __func__, t->bits_per_word);
                return -EINVAL;
        }