From 3e2609bf99326dc5da6514dbd772fbacdc62c366 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 12 Mar 2013 00:13:43 +0100 Subject: [PATCH] --- yaml --- r: 365211 b: refs/heads/master c: 58d8bebea57b519cb606a59dc1263556e8746119 h: refs/heads/master i: 365209: c96c9f8ad2fb27670b8eaf4914adbda98ff6d8b3 365207: 3e21d27aaa275c83ed19f1b93344eb1058b64c65 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-bcm63xx.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c7a58d7e52c0..412e0dbf55d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2bdae06329ef3fb8918032735cd963efc701b7e +refs/heads/master: 58d8bebea57b519cb606a59dc1263556e8746119 diff --git a/trunk/drivers/spi/spi-bcm63xx.c b/trunk/drivers/spi/spi-bcm63xx.c index b64229ca7f54..b9c9431286e4 100644 --- a/trunk/drivers/spi/spi-bcm63xx.c +++ b/trunk/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; }