Skip to content

Commit de4af89

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
spi: ppc4xx: Fix fallout from rename in struct spi_bitbang
I failed to adapt this driver because it's not enabled in a powerpc allmodconfig build and also wasn't hit by my grep expertise. Fix accordingly. Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Fixes: 2259233 ("spi: bitbang: Follow renaming of SPI "master" to "controller"") Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6f98e44 commit de4af89

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/spi/spi-ppc4xx.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -364,22 +364,22 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
364364

365365
/* Setup the state for the bitbang driver */
366366
bbp = &hw->bitbang;
367-
bbp->master = hw->host;
367+
bbp->ctlr = hw->host;
368368
bbp->setup_transfer = spi_ppc4xx_setupxfer;
369369
bbp->txrx_bufs = spi_ppc4xx_txrx;
370370
bbp->use_dma = 0;
371-
bbp->master->setup = spi_ppc4xx_setup;
372-
bbp->master->cleanup = spi_ppc4xx_cleanup;
373-
bbp->master->bits_per_word_mask = SPI_BPW_MASK(8);
374-
bbp->master->use_gpio_descriptors = true;
371+
bbp->ctlr->setup = spi_ppc4xx_setup;
372+
bbp->ctlr->cleanup = spi_ppc4xx_cleanup;
373+
bbp->ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
374+
bbp->ctlr->use_gpio_descriptors = true;
375375
/*
376376
* The SPI core will count the number of GPIO descriptors to figure
377377
* out the number of chip selects available on the platform.
378378
*/
379-
bbp->master->num_chipselect = 0;
379+
bbp->ctlr->num_chipselect = 0;
380380

381381
/* the spi->mode bits understood by this driver: */
382-
bbp->master->mode_bits =
382+
bbp->ctlr->mode_bits =
383383
SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST;
384384

385385
/* Get the clock for the OPB */

0 commit comments

Comments
 (0)