spi: pxa2xx: Drop duplicate chip_select in struct chip_data

The struct chip_data had been introduced in order to keep the parameters
that may be provided on stack during device allocation. There is no need
to duplicate parameters there, which are carried on by SPI device itself.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210517140351.901-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 1a0bcd3bac1f8518ee9c9e672022b214d5a259b9..fb80f6013d54b4fc5311422bbc464b226354785e 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -432,7 +432,7 @@ static void cs_assert(struct spi_device *spi)
                spi_controller_get_devdata(spi->controller);
 
        if (drv_data->ssp_type == CE4100_SSP) {
-               pxa2xx_spi_write(drv_data, SSSR, chip->frm);
+               pxa2xx_spi_write(drv_data, SSSR, spi->chip_select);
                return;
        }
 
@@ -1303,8 +1303,6 @@ static int setup(struct spi_device *spi)
                                kfree(chip);
                                return -EINVAL;
                        }
-
-                       chip->frm = spi->chip_select;
                }
                chip->enable_dma = drv_data->controller_info->enable_dma;
                chip->timeout = TIMOUT_DFLT;

diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index a91fe6edb275086a78d46565dba93a3d1a09ebca..db9de46110ade56a25bff75bbb0904f8a1b15d4f 100644 (file)
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -72,7 +72,6 @@ struct chip_data {
        int (*write)(struct driver_data *drv_data);
        int (*read)(struct driver_data *drv_data);
 
-       unsigned int frm;
        void (*cs_control)(u32 command);
 };