spi: Drop mismerged fix

One patch of a series of three that was sent fixing issues with the
ppc4xx driver was targeted at -next, unfortunately it being sandwiched
between two others that targeted mainline tripped up my workflow and
caused it to get merged along with the others.  The ppc4xx driver is
only buildable in very limited configurations so none of the CI catches
issues with it.

Fixes: de4af897ddf2 ("spi: ppc4xx: Fix fallout from rename in struct spi_bitbang")
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 942c3117ab3a904de67c59e7e13e5d40995dd00a..82d6264841fc7f090a5541235569e40023330483 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->ctlr = hw->host;
+       bbp->master = hw->host;
        bbp->setup_transfer = spi_ppc4xx_setupxfer;
        bbp->txrx_bufs = spi_ppc4xx_txrx;
        bbp->use_dma = 0;
-       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;
+       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;
        /*
         * The SPI core will count the number of GPIO descriptors to figure
         * out the number of chip selects available on the platform.
         */
-       bbp->ctlr->num_chipselect = 0;
+       bbp->master->num_chipselect = 0;
 
        /* the spi->mode bits understood by this driver: */
-       bbp->ctlr->mode_bits =
+       bbp->master->mode_bits =
                SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST;
 
        /* Get the clock for the OPB */