Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c40537d0 authored by Mark Brown's avatar Mark Brown
Browse files

spi/xilinx: Convert to devm_ioremap_resource() 



Saves code and reduces the possibility of error.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ad81f054

drivers/spi/spi-xilinx.c

+5 −15
Original line number Diff line number Diff line
@@ -362,14 +362,10 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, 
	xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;

	init_completion(&xspi->done);



	if (!request_mem_region(mem->start, resource_size(mem),

		XILINX_SPI_NAME))

	xspi->regs = devm_ioremap_resource(dev, mem);

	if (IS_ERR(xspi->regs)) {

		ret = PTR_ERR(xspi->regs);

		goto put_master;



	xspi->regs = ioremap(mem->start, resource_size(mem));

	if (xspi->regs == NULL) {

		dev_warn(dev, "ioremap failure\n");

		goto map_failed;

	}



	master->bus_num = bus_num;
@@ -408,7 +404,7 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, 
		xspi->tx_fn = xspi_tx32;

		xspi->rx_fn = xspi_rx32;

	} else

		goto unmap_io;

		goto put_master;





	/* SPI controller initializations */
@@ -417,7 +413,7 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, 
	/* Register for SPI Interrupt */

	ret = request_irq(xspi->irq, xilinx_spi_irq, 0, XILINX_SPI_NAME, xspi);

	if (ret)

		goto unmap_io;

		goto put_master;



	ret = spi_bitbang_start(&xspi->bitbang);

	if (ret) {
@@ -431,10 +427,6 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, 


free_irq:

	free_irq(xspi->irq, xspi);

unmap_io:

	iounmap(xspi->regs);

map_failed:

	release_mem_region(mem->start, resource_size(mem));

put_master:

	spi_master_put(master);

	return NULL;
@@ -449,9 +441,7 @@ void xilinx_spi_deinit(struct spi_master *master) 


	spi_bitbang_stop(&xspi->bitbang);

	free_irq(xspi->irq, xspi);

	iounmap(xspi->regs);



	release_mem_region(xspi->mem.start, resource_size(&xspi->mem));

	spi_master_put(xspi->bitbang.master);

}

EXPORT_SYMBOL(xilinx_spi_deinit);