spi: Remove duplicate code to set default bits_per_word setting

[linux-2.6-microblaze.git] / drivers / spi / spi-sh.c

diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index c120a70..86a17d6 100644 (file)
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -358,9 +358,6 @@ static int spi_sh_setup(struct spi_device *spi)
 {
        struct spi_sh_data *ss = spi_master_get_devdata(spi->master);
 
-       if (!spi->bits_per_word)
-               spi->bits_per_word = 8;
-
        pr_debug("%s: enter\n", __func__);
 
        spi_sh_write(ss, 0xfe, SPI_SH_CR1);     /* SPI sycle stop */