Merge tag 'spi-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[sfrench/cifs-2.6.git] / drivers / spi / spi-ppc4xx.c

diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 82d6264841fc7f090a5541235569e40023330483..942c3117ab3a904de67c59e7e13e5d40995dd00a 100644 (file)
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -359,22 +359,22 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
 
        /* Setup the state for the bitbang driver */
        bbp = &hw->bitbang;
-       bbp->master = hw->host;
+       bbp->ctlr = hw->host;
        bbp->setup_transfer = spi_ppc4xx_setupxfer;
        bbp->txrx_bufs = spi_ppc4xx_txrx;
        bbp->use_dma = 0;
-       bbp->master->setup = spi_ppc4xx_setup;
-       bbp->master->cleanup = spi_ppc4xx_cleanup;
-       bbp->master->bits_per_word_mask = SPI_BPW_MASK(8);
-       bbp->master->use_gpio_descriptors = true;
+       bbp->ctlr->setup = spi_ppc4xx_setup;
+       bbp->ctlr->cleanup = spi_ppc4xx_cleanup;
+       bbp->ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
+       bbp->ctlr->use_gpio_descriptors = true;
        /*
         * The SPI core will count the number of GPIO descriptors to figure
         * out the number of chip selects available on the platform.
         */
-       bbp->master->num_chipselect = 0;
+       bbp->ctlr->num_chipselect = 0;
 
        /* the spi->mode bits understood by this driver: */
-       bbp->master->mode_bits =
+       bbp->ctlr->mode_bits =
                SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST;
 
        /* Get the clock for the OPB */