Skip to content

Commit d748b48

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://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 7861156 commit d748b48

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
@@ -362,22 +362,22 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
362362

363363
/* Setup the state for the bitbang driver */
364364
bbp = &hw->bitbang;
365-
bbp->master = hw->host;
365+
bbp->ctlr = hw->host;
366366
bbp->setup_transfer = spi_ppc4xx_setupxfer;
367367
bbp->txrx_bufs = spi_ppc4xx_txrx;
368368
bbp->use_dma = 0;
369-
bbp->master->setup = spi_ppc4xx_setup;
370-
bbp->master->cleanup = spi_ppc4xx_cleanup;
371-
bbp->master->bits_per_word_mask = SPI_BPW_MASK(8);
372-
bbp->master->use_gpio_descriptors = true;
369+
bbp->ctlr->setup = spi_ppc4xx_setup;
370+
bbp->ctlr->cleanup = spi_ppc4xx_cleanup;
371+
bbp->ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
372+
bbp->ctlr->use_gpio_descriptors = true;
373373
/*
374374
* The SPI core will count the number of GPIO descriptors to figure
375375
* out the number of chip selects available on the platform.
376376
*/
377-
bbp->master->num_chipselect = 0;
377+
bbp->ctlr->num_chipselect = 0;
378378

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

383383
/* Get the clock for the OPB */

0 commit comments

Comments
 (0)