31 lines
1,004 B
Diff
31 lines
1,004 B
Diff
|
From d69ac73da38f0d16cc6b4524cd734b907db6eab8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Mon, 11 Mar 2013 13:51:10 +0100
|
||
|
|
Subject: [PATCH 08/12] 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>
|
||
|
|
---
|
||
|
|
drivers/spi/spi-bcm63xx.c | 7 ++-----
|
||
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/spi/spi-bcm63xx.c
|
||
|
|
+++ b/drivers/spi/spi-bcm63xx.c
|
||
|
|
@@ -96,12 +96,9 @@ static const unsigned bcm63xx_spi_freq_t
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|