From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 11 Mar 2013 23:13:43 +0000 (+0100)
Subject: spi/bcm63xx: simplify bcm63xx_spi_check_transfer
X-Git-Tag: next-20130320~35^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=58d8bebea57b519cb606a59dc1263556e8746119;p=karo-tx-linux.git

spi/bcm63xx: simplify bcm63xx_spi_check_transfer

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>
---

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index b64229ca7f54..b9c9431286e4 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -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;
 	}