spi: clps711x: Convert to use CS GPIO descriptors

This converts the CLPS711x SPI master driver to use GPIO
descriptors for chip select handling.

The CLPS711x driver was merely requesting the GPIO and
setting the CS line non-asserted so this was a pretty
straight-forward conversion. The setup callback goes away.

Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: Linuxarm <linuxarm@huawei.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 18193df2eba8ab360d5326bee453a4349fd7b7a1..8c03c409fc07753c3b65887862b026a23182d6a6 100644 (file)
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -11,7 +11,7 @@
 
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
@@ -36,25 +36,6 @@ struct spi_clps711x_data {
        int                     len;
 };
 
-static int spi_clps711x_setup(struct spi_device *spi)
-{
-       if (!spi->controller_state) {
-               int ret;
-
-               ret = devm_gpio_request(&spi->master->dev, spi->cs_gpio,
-                                       dev_name(&spi->master->dev));
-               if (ret)
-                       return ret;
-
-               spi->controller_state = spi;
-       }
-
-       /* We are expect that SPI-device is not selected */
-       gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
-
-       return 0;
-}
-
 static int spi_clps711x_prepare_message(struct spi_master *master,
                                        struct spi_message *msg)
 {
@@ -125,11 +106,11 @@ static int spi_clps711x_probe(struct platform_device *pdev)
        if (!master)
                return -ENOMEM;
 
+       master->use_gpio_descriptors = true;
        master->bus_num = -1;
        master->mode_bits = SPI_CPHA | SPI_CS_HIGH;
        master->bits_per_word_mask =  SPI_BPW_RANGE_MASK(1, 8);
        master->dev.of_node = pdev->dev.of_node;
-       master->setup = spi_clps711x_setup;
        master->prepare_message = spi_clps711x_prepare_message;
        master->transfer_one = spi_clps711x_transfer_one;