spi: imx: Remove unnecessary field "mode" from struct spi_imx_config

SPI mode can be obtained directly from spi-device, there is no
need to keep a copy.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index cbcfb8b70b21c67c548f985b122bd19bab55c005..0aa38c23e064af1ee52f1cb30f08e77bb17bfec7 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -59,7 +59,6 @@
 struct spi_imx_config {
        unsigned int speed_hz;
        unsigned int bpw;
-       unsigned int mode;
 };
 
 enum spi_imx_devtype {
@@ -360,19 +359,19 @@ static int __maybe_unused mx51_ecspi_config(struct spi_device *spi,
 
        cfg |= MX51_ECSPI_CONFIG_SBBCTRL(spi->chip_select);
 
-       if (config->mode & SPI_CPHA)
+       if (spi->mode & SPI_CPHA)
                cfg |= MX51_ECSPI_CONFIG_SCLKPHA(spi->chip_select);
        else
                cfg &= ~MX51_ECSPI_CONFIG_SCLKPHA(spi->chip_select);
 
-       if (config->mode & SPI_CPOL) {
+       if (spi->mode & SPI_CPOL) {
                cfg |= MX51_ECSPI_CONFIG_SCLKPOL(spi->chip_select);
                cfg |= MX51_ECSPI_CONFIG_SCLKCTL(spi->chip_select);
        } else {
                cfg &= ~MX51_ECSPI_CONFIG_SCLKPOL(spi->chip_select);
                cfg &= ~MX51_ECSPI_CONFIG_SCLKCTL(spi->chip_select);
        }
-       if (config->mode & SPI_CS_HIGH)
+       if (spi->mode & SPI_CS_HIGH)
                cfg |= MX51_ECSPI_CONFIG_SSBPOL(spi->chip_select);
        else
                cfg &= ~MX51_ECSPI_CONFIG_SSBPOL(spi->chip_select);
@@ -384,7 +383,7 @@ static int __maybe_unused mx51_ecspi_config(struct spi_device *spi,
        writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
 
        reg = readl(spi_imx->base + MX51_ECSPI_TESTREG);
-       if (config->mode & SPI_LOOP)
+       if (spi->mode & SPI_LOOP)
                reg |= MX51_ECSPI_TESTREG_LBC;
        else
                reg &= ~MX51_ECSPI_TESTREG_LBC;
@@ -495,11 +494,11 @@ static int __maybe_unused mx31_config(struct spi_device *spi,
                reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT;
        }
 
-       if (config->mode & SPI_CPHA)
+       if (spi->mode & SPI_CPHA)
                reg |= MX31_CSPICTRL_PHA;
-       if (config->mode & SPI_CPOL)
+       if (spi->mode & SPI_CPOL)
                reg |= MX31_CSPICTRL_POL;
-       if (config->mode & SPI_CS_HIGH)
+       if (spi->mode & SPI_CS_HIGH)
                reg |= MX31_CSPICTRL_SSPOL;
        if (spi->cs_gpio < 0)
                reg |= (spi->cs_gpio + 32) <<
@@ -568,11 +567,11 @@ static int __maybe_unused mx21_config(struct spi_device *spi,
                MX21_CSPICTRL_DR_SHIFT;
        reg |= config->bpw - 1;
 
-       if (config->mode & SPI_CPHA)
+       if (spi->mode & SPI_CPHA)
                reg |= MX21_CSPICTRL_PHA;
-       if (config->mode & SPI_CPOL)
+       if (spi->mode & SPI_CPOL)
                reg |= MX21_CSPICTRL_POL;
-       if (config->mode & SPI_CS_HIGH)
+       if (spi->mode & SPI_CS_HIGH)
                reg |= MX21_CSPICTRL_SSPOL;
        if (spi->cs_gpio < 0)
                reg |= (spi->cs_gpio + 32) << MX21_CSPICTRL_CS_SHIFT;
@@ -634,9 +633,9 @@ static int __maybe_unused mx1_config(struct spi_device *spi,
                MX1_CSPICTRL_DR_SHIFT;
        reg |= config->bpw - 1;
 
-       if (config->mode & SPI_CPHA)
+       if (spi->mode & SPI_CPHA)
                reg |= MX1_CSPICTRL_PHA;
-       if (config->mode & SPI_CPOL)
+       if (spi->mode & SPI_CPOL)
                reg |= MX1_CSPICTRL_POL;
 
        writel(reg, spi_imx->base + MXC_CSPICTRL);
@@ -857,7 +856,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 
        config.bpw = t ? t->bits_per_word : spi->bits_per_word;
        config.speed_hz  = t ? t->speed_hz : spi->max_speed_hz;
-       config.mode = spi->mode;
 
        if (!config.speed_hz)
                config.speed_hz = spi->max_speed_hz;