summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-03-12 00:13:43 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-12 19:14:46 +0000
commit58d8bebea57b519cb606a59dc1263556e8746119 (patch)
tree7b6c39f6792ef8b6833bdebd9571f4f31cb51723 /drivers/spi
parente2bdae06329ef3fb8918032735cd963efc701b7e (diff)
downloadlinux-58d8bebea57b519cb606a59dc1263556e8746119.tar.bz2
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-bcm63xx.c7
1 files changed, 2 insertions, 5 deletions
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;
}