spi/s3c64xx: Remove unused /CS GPIO management
authorMark Brown <broonie@linaro.org>
Fri, 24 Jan 2014 19:00:55 +0000 (19:00 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 4 Feb 2014 12:49:10 +0000 (12:49 +0000)
The GPIO enable and disable is done in the core so does not need to be
replicated in the driver, delete the unneeded code. enable_cs() was not
referenced at all.

Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-s3c64xx.c

index ae907dde1371c9133c526ad66daf16155d03fbe9..da32cd9c9b59f1ff76725f83fd7e80141333d79e 100644 (file)
@@ -555,23 +555,6 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
        writel(chcfg, regs + S3C64XX_SPI_CH_CFG);
 }
 
-static inline void enable_cs(struct s3c64xx_spi_driver_data *sdd,
-                                               struct spi_device *spi)
-{
-       if (sdd->tgl_spi != NULL) { /* If last device toggled after mssg */
-               if (sdd->tgl_spi != spi) { /* if last mssg on diff device */
-                       /* Deselect the last toggled device */
-                       if (spi->cs_gpio >= 0)
-                               gpio_set_value(spi->cs_gpio,
-                                       spi->mode & SPI_CS_HIGH ? 0 : 1);
-               }
-               sdd->tgl_spi = NULL;
-       }
-
-       if (spi->cs_gpio >= 0)
-               gpio_set_value(spi->cs_gpio, spi->mode & SPI_CS_HIGH ? 1 : 0);
-}
-
 static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd,
                                        int timeout_ms)
 {
@@ -691,16 +674,6 @@ static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd,
        return 0;
 }
 
-static inline void disable_cs(struct s3c64xx_spi_driver_data *sdd,
-                                               struct spi_device *spi)
-{
-       if (sdd->tgl_spi == spi)
-               sdd->tgl_spi = NULL;
-
-       if (spi->cs_gpio >= 0)
-               gpio_set_value(spi->cs_gpio, spi->mode & SPI_CS_HIGH ? 0 : 1);
-}
-
 static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
 {
        void __iomem *regs = sdd->regs;
@@ -1092,14 +1065,12 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
 
        pm_runtime_put(&sdd->pdev->dev);
        writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
-       disable_cs(sdd, spi);
        return 0;
 
 setup_exit:
        pm_runtime_put(&sdd->pdev->dev);
        /* setup() returns with device de-selected */
        writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
-       disable_cs(sdd, spi);
 
        gpio_free(cs->line);
        spi_set_ctldata(spi, NULL);