Unverified Commit 801185ef authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: fsl-lib: Follow renaming of SPI "master" to "controller" 



In commit 8caab75f ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.

To be able to remove these compatibility macros push the renaming into
this driver.

Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/b3d724ca2b641f1d717a7ddb9810bdf27168dc35.1707324794.git.u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 30060d57

drivers/spi/spi-fsl-lib.c

+7 −7
Original line number Diff line number Diff line
@@ -82,18 +82,18 @@ void mpc8xxx_spi_probe(struct device *dev, struct resource *mem, 
			unsigned int irq)

{

	struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);

	struct spi_master *master;

	struct spi_controller *ctlr;

	struct mpc8xxx_spi *mpc8xxx_spi;



	master = dev_get_drvdata(dev);

	ctlr = dev_get_drvdata(dev);



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH

	ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH

			| SPI_LSB_FIRST | SPI_LOOP;



	master->dev.of_node = dev->of_node;

	ctlr->dev.of_node = dev->of_node;



	mpc8xxx_spi = spi_master_get_devdata(master);

	mpc8xxx_spi = spi_controller_get_devdata(ctlr);

	mpc8xxx_spi->dev = dev;

	mpc8xxx_spi->get_rx = mpc8xxx_spi_rx_buf_u8;

	mpc8xxx_spi->get_tx = mpc8xxx_spi_tx_buf_u8;
@@ -104,8 +104,8 @@ void mpc8xxx_spi_probe(struct device *dev, struct resource *mem, 
	mpc8xxx_spi->rx_shift = 0;

	mpc8xxx_spi->tx_shift = 0;



	master->bus_num = pdata->bus_num;

	master->num_chipselect = pdata->max_chipselect;

	ctlr->bus_num = pdata->bus_num;

	ctlr->num_chipselect = pdata->max_chipselect;



	init_completion(&mpc8xxx_spi->done);

}