spi: Replace all spi->chip_select and spi->cs_gpiod references with function call

[linux-2.6-microblaze.git] / drivers / spi / spi-pxa2xx.c

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index a75ba29..d04e8cb 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -368,7 +368,7 @@ static void lpss_ssp_select_cs(struct spi_device *spi,
 
        value = __lpss_ssp_read_priv(drv_data, config->reg_cs_ctrl);
 
-       cs = spi->chip_select;
+       cs = spi_get_chipselect(spi, 0);
        cs <<= config->cs_sel_shift;
        if (cs != (value & config->cs_sel_mask)) {
                /*
@@ -429,7 +429,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, spi->chip_select);
+               pxa2xx_spi_write(drv_data, SSSR, spi_get_chipselect(spi, 0));
                return;
        }
 
@@ -1217,7 +1217,7 @@ static int setup(struct spi_device *spi)
                        return -ENOMEM;
 
                if (drv_data->ssp_type == CE4100_SSP) {
-                       if (spi->chip_select > 4) {
+                       if (spi_get_chipselect(spi, 0) > 4) {
                                dev_err(&spi->dev,
                                        "failed setup: cs number must not be > 4.\n");
                                kfree(chip);