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

spi: bitbang: 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
the SPI bitbang controller drivers.

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/f7f949feb803acb8bea75798f41371a13287f4e8.1707324794.git.u.kleine-koenig@pengutronix.de


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

drivers/spi/spi-ath79.c

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int ath79_spi_probe(struct platform_device *pdev) 
	host->num_chipselect = 3;

	host->mem_ops = &ath79_mem_ops;



	sp->bitbang.master = host;

	sp->bitbang.ctlr = host;

	sp->bitbang.chipselect = ath79_spi_chipselect;

	sp->bitbang.txrx_word[SPI_MODE_0] = ath79_spi_txrx_mode0;

	sp->bitbang.flags = SPI_CS_HIGH;
@@ -237,7 +237,7 @@ static void ath79_spi_remove(struct platform_device *pdev) 


	spi_bitbang_stop(&sp->bitbang);

	ath79_spi_disable(sp);

	spi_controller_put(sp->bitbang.master);

	spi_controller_put(sp->bitbang.ctlr);

}



static void ath79_spi_shutdown(struct platform_device *pdev)

drivers/spi/spi-au1550.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static int au1550_spi_probe(struct platform_device *pdev) 


	init_completion(&hw->host_done);



	hw->bitbang.master = hw->host;

	hw->bitbang.ctlr = hw->host;

	hw->bitbang.setup_transfer = au1550_spi_setupxfer;

	hw->bitbang.chipselect = au1550_spi_chipsel;

	hw->bitbang.txrx_bufs = au1550_spi_txrx_bufs;

drivers/spi/spi-bitbang.c

+32 −32
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int spi_bitbang_setup(struct spi_device *spi) 
	bool			initial_setup = false;

	int			retval;



	bitbang = spi_master_get_devdata(spi->master);

	bitbang = spi_controller_get_devdata(spi->controller);



	if (!cs) {

		cs = kzalloc(sizeof(*cs), GFP_KERNEL);
@@ -236,7 +236,7 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t) 
	unsigned		nsecs = cs->nsecs;

	struct spi_bitbang	*bitbang;



	bitbang = spi_master_get_devdata(spi->master);

	bitbang = spi_controller_get_devdata(spi->controller);

	if (bitbang->set_line_direction) {

		int err;
@@ -268,11 +268,11 @@ static int spi_bitbang_bufs(struct spi_device *spi, struct spi_transfer *t) 
 * transfer-at-a-time ones to leverage dma or fifo hardware.

 */



static int spi_bitbang_prepare_hardware(struct spi_master *spi)

static int spi_bitbang_prepare_hardware(struct spi_controller *spi)

{

	struct spi_bitbang	*bitbang;



	bitbang = spi_master_get_devdata(spi);

	bitbang = spi_controller_get_devdata(spi);



	mutex_lock(&bitbang->lock);

	bitbang->busy = 1;
@@ -281,11 +281,11 @@ static int spi_bitbang_prepare_hardware(struct spi_master *spi) 
	return 0;

}



static int spi_bitbang_transfer_one(struct spi_master *master,

static int spi_bitbang_transfer_one(struct spi_controller *ctlr,

				    struct spi_device *spi,

				    struct spi_transfer *transfer)

{

	struct spi_bitbang *bitbang = spi_master_get_devdata(master);

	struct spi_bitbang *bitbang = spi_controller_get_devdata(ctlr);

	int status = 0;



	if (bitbang->setup_transfer) {
@@ -303,16 +303,16 @@ static int spi_bitbang_transfer_one(struct spi_master *master, 
		status = -EREMOTEIO;



out:

	spi_finalize_current_transfer(master);

	spi_finalize_current_transfer(ctlr);



	return status;

}



static int spi_bitbang_unprepare_hardware(struct spi_master *spi)

static int spi_bitbang_unprepare_hardware(struct spi_controller *spi)

{

	struct spi_bitbang	*bitbang;



	bitbang = spi_master_get_devdata(spi);

	bitbang = spi_controller_get_devdata(spi);



	mutex_lock(&bitbang->lock);

	bitbang->busy = 0;
@@ -323,7 +323,7 @@ static int spi_bitbang_unprepare_hardware(struct spi_master *spi) 


static void spi_bitbang_set_cs(struct spi_device *spi, bool enable)

{

	struct spi_bitbang *bitbang = spi_master_get_devdata(spi->master);

	struct spi_bitbang *bitbang = spi_controller_get_devdata(spi->controller);



	/* SPI core provides CS high / low, but bitbang driver

	 * expects CS active
@@ -341,10 +341,10 @@ static void spi_bitbang_set_cs(struct spi_device *spi, bool enable) 


int spi_bitbang_init(struct spi_bitbang *bitbang)

{

	struct spi_master *master = bitbang->master;

	struct spi_controller *ctlr = bitbang->ctlr;

	bool custom_cs;



	if (!master)

	if (!ctlr)

		return -EINVAL;

	/*

	 * We only need the chipselect callback if we are actually using it.
@@ -352,39 +352,39 @@ int spi_bitbang_init(struct spi_bitbang *bitbang) 
	 * SPI_CONTROLLER_GPIO_SS flag is set, we always need to call the

	 * driver-specific chipselect routine.

	 */

	custom_cs = (!master->use_gpio_descriptors ||

		     (master->flags & SPI_CONTROLLER_GPIO_SS));

	custom_cs = (!ctlr->use_gpio_descriptors ||

		     (ctlr->flags & SPI_CONTROLLER_GPIO_SS));



	if (custom_cs && !bitbang->chipselect)

		return -EINVAL;



	mutex_init(&bitbang->lock);



	if (!master->mode_bits)

		master->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;

	if (!ctlr->mode_bits)

		ctlr->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;



	if (master->transfer || master->transfer_one_message)

	if (ctlr->transfer || ctlr->transfer_one_message)

		return -EINVAL;



	master->prepare_transfer_hardware = spi_bitbang_prepare_hardware;

	master->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;

	master->transfer_one = spi_bitbang_transfer_one;

	ctlr->prepare_transfer_hardware = spi_bitbang_prepare_hardware;

	ctlr->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;

	ctlr->transfer_one = spi_bitbang_transfer_one;

	/*

	 * When using GPIO descriptors, the ->set_cs() callback doesn't even

	 * get called unless SPI_CONTROLLER_GPIO_SS is set.

	 */

	if (custom_cs)

		master->set_cs = spi_bitbang_set_cs;

		ctlr->set_cs = spi_bitbang_set_cs;



	if (!bitbang->txrx_bufs) {

		bitbang->use_dma = 0;

		bitbang->txrx_bufs = spi_bitbang_bufs;

		if (!master->setup) {

		if (!ctlr->setup) {

			if (!bitbang->setup_transfer)

				bitbang->setup_transfer =

					 spi_bitbang_setup_transfer;

			master->setup = spi_bitbang_setup;

			master->cleanup = spi_bitbang_cleanup;

			ctlr->setup = spi_bitbang_setup;

			ctlr->cleanup = spi_bitbang_cleanup;

		}

	}
@@ -411,18 +411,18 @@ EXPORT_SYMBOL_GPL(spi_bitbang_init); 
 * master methods.  Those methods are the defaults if the bitbang->txrx_bufs

 * routine isn't initialized.

 *

 * This routine registers the spi_master, which will process requests in a

 * This routine registers the spi_controller, which will process requests in a

 * dedicated task, keeping IRQs unblocked most of the time.  To stop

 * processing those requests, call spi_bitbang_stop().

 *

 * On success, this routine will take a reference to master. The caller is

 * responsible for calling spi_bitbang_stop() to decrement the reference and

 * spi_master_put() as counterpart of spi_alloc_master() to prevent a memory

 * On success, this routine will take a reference to the controller. The caller

 * is responsible for calling spi_bitbang_stop() to decrement the reference and

 * spi_controller_put() as counterpart of spi_alloc_master() to prevent a memory

 * leak.

 */

int spi_bitbang_start(struct spi_bitbang *bitbang)

{

	struct spi_master *master = bitbang->master;

	struct spi_controller *ctlr = bitbang->ctlr;

	int ret;



	ret = spi_bitbang_init(bitbang);
@@ -432,9 +432,9 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) 
	/* driver may get busy before register() returns, especially

	 * if someone registered boardinfo for devices

	 */

	ret = spi_register_master(spi_master_get(master));

	ret = spi_register_controller(spi_controller_get(ctlr));

	if (ret)

		spi_master_put(master);

		spi_controller_put(ctlr);



	return ret;

}
@@ -445,7 +445,7 @@ EXPORT_SYMBOL_GPL(spi_bitbang_start); 
 */

void spi_bitbang_stop(struct spi_bitbang *bitbang)

{

	spi_unregister_master(bitbang->master);

	spi_unregister_controller(bitbang->ctlr);

}

EXPORT_SYMBOL_GPL(spi_bitbang_stop);

drivers/spi/spi-butterfly.c

+3 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void butterfly_attach(struct parport *p) 
	host->bus_num = 42;

	host->num_chipselect = 2;



	pp->bitbang.master = host;

	pp->bitbang.ctlr = host;

	pp->bitbang.chipselect = butterfly_chipselect;

	pp->bitbang.txrx_word[SPI_MODE_0] = butterfly_txrx_word_mode0;
@@ -263,7 +263,7 @@ static void butterfly_attach(struct parport *p) 
	pp->info[0].platform_data = &flash;

	pp->info[0].chip_select = 1;

	pp->info[0].controller_data = pp;

	pp->dataflash = spi_new_device(pp->bitbang.master, &pp->info[0]);

	pp->dataflash = spi_new_device(pp->bitbang.ctlr, &pp->info[0]);

	if (pp->dataflash)

		pr_debug("%s: dataflash at %s\n", p->name,

			 dev_name(&pp->dataflash->dev));
@@ -308,7 +308,7 @@ static void butterfly_detach(struct parport *p) 
	parport_release(pp->pd);

	parport_unregister_device(pp->pd);



	spi_controller_put(pp->bitbang.master);

	spi_controller_put(pp->bitbang.ctlr);

}



static struct parport_driver butterfly_driver = {

drivers/spi/spi-davinci.c

+3 −3
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static bool davinci_spi_can_dma(struct spi_controller *host, 


static int davinci_spi_check_error(struct davinci_spi *dspi, int int_status)

{

	struct device *sdev = dspi->bitbang.master->dev.parent;

	struct device *sdev = dspi->bitbang.ctlr->dev.parent;



	if (int_status & SPIFLG_TIMEOUT_MASK) {

		dev_err(sdev, "SPI Time-out Error\n");
@@ -742,7 +742,7 @@ static irqreturn_t davinci_spi_irq(s32 irq, void *data) 


static int davinci_spi_request_dma(struct davinci_spi *dspi)

{

	struct device *sdev = dspi->bitbang.master->dev.parent;

	struct device *sdev = dspi->bitbang.ctlr->dev.parent;



	dspi->dma_rx = dma_request_chan(sdev, "rx");

	if (IS_ERR(dspi->dma_rx))
@@ -913,7 +913,7 @@ static int davinci_spi_probe(struct platform_device *pdev) 
	if (ret)

		goto free_host;



	dspi->bitbang.master = host;

	dspi->bitbang.ctlr = host;



	dspi->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(dspi->clk)) {