target/linux/brcm63xx/patches-3.8/010-spi-bcm63xx-simplify-bcm63xx_spi_check_transfer.patch

   1 From d69ac73da38f0d16cc6b4524cd734b907db6eab8 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jogo@openwrt.org>
   3 Date: Mon, 11 Mar 2013 13:51:10 +0100
   4 Subject: [PATCH 08/12] spi/bcm63xx: simplify bcm63xx_spi_check_transfer
   5
   6 bcm63xx_spi_check_transfer is only called from one place that has
   7 t always set, so directly check the transfer's bits_per_word.
   8
   9 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  10 ---
  11  drivers/spi/spi-bcm63xx.c |    7 ++-----
  12  1 file changed, 2 insertions(+), 5 deletions(-)
  13
  14 --- a/drivers/spi/spi-bcm63xx.c
  15 +++ b/drivers/spi/spi-bcm63xx.c
  16 @@ -96,12 +96,9 @@ static const unsigned bcm63xx_spi_freq_t
  17  static int bcm63xx_spi_check_transfer(struct spi_device *spi,
  18                                         struct spi_transfer *t)
  19  {
  20 -       u8 bits_per_word;
  21 -
  22 -       bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
  23 -       if (bits_per_word != 8) {
  24 +       if (t->bits_per_word != 8) {
  25                 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
  26 -                       __func__, bits_per_word);
  27 +                       __func__, t->bits_per_word);
  28                 return -EINVAL;
  29         }
  30