Merge tag 'hwmon-for-linus-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / spi / spi-bcm2835.c

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index cf04960cc3e6ca1f5a87ad24f3d88cdbcfaa8a36..f35cc10772f6670397ea923ad30158270dd68578 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -727,11 +727,6 @@ static int bcm2835_spi_setup(struct spi_device *spi)
                        spi->chip_select, spi->cs_gpio, err);
                return err;
        }
-       /* the implementation of pinctrl-bcm2835 currently does not
-        * set the GPIO value when using gpio_direction_output
-        * so we are setting it here explicitly
-        */
-       gpio_set_value(spi->cs_gpio, (spi->mode & SPI_CS_HIGH) ? 0 : 1);
 
        return 0;
 }