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

Commit 4178b6b1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mark Brown
Browse files

spi: fsl-(e)spi: migrate to using devm_ functions to simplify cleanup 



Migrate fsl-espi and fsl-spi to using the managed devm_ functions
for resource handling. This simplifies the cleanup.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc0195aa

drivers/spi/spi-fsl-espi.c

+5 −15
Original line number Diff line number Diff line
@@ -604,11 +604,6 @@ static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) 
	return ret;

}



static void fsl_espi_remove(struct mpc8xxx_spi *mspi)

{

	iounmap(mspi->reg_base);

}



static int fsl_espi_suspend(struct spi_master *master)

{

	struct mpc8xxx_spi *mpc8xxx_spi;
@@ -671,9 +666,8 @@ static struct spi_master * fsl_espi_probe(struct device *dev, 
	master->unprepare_transfer_hardware = fsl_espi_suspend;



	mpc8xxx_spi = spi_master_get_devdata(master);

	mpc8xxx_spi->spi_remove = fsl_espi_remove;



	mpc8xxx_spi->reg_base = ioremap(mem->start, resource_size(mem));

	mpc8xxx_spi->reg_base = devm_ioremap_resource(dev, mem);

	if (!mpc8xxx_spi->reg_base) {

		ret = -ENOMEM;

		goto err_probe;
@@ -682,10 +676,10 @@ static struct spi_master * fsl_espi_probe(struct device *dev, 
	reg_base = mpc8xxx_spi->reg_base;



	/* Register for SPI Interrupt */

	ret = request_irq(mpc8xxx_spi->irq, fsl_espi_irq,

	ret = devm_request_irq(dev, mpc8xxx_spi->irq, fsl_espi_irq,

			  0, "fsl_espi", mpc8xxx_spi);

	if (ret)

		goto free_irq;

		goto err_probe;



	if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE) {

		mpc8xxx_spi->rx_shift = 16;
@@ -731,18 +725,14 @@ static struct spi_master * fsl_espi_probe(struct device *dev, 


	mpc8xxx_spi_write_reg(&reg_base->mode, regval);



	ret = spi_register_master(master);

	ret = devm_spi_register_master(dev, master);

	if (ret < 0)

		goto unreg_master;

		goto err_probe;



	dev_info(dev, "at 0x%p (irq = %d)\n", reg_base, mpc8xxx_spi->irq);



	return master;



unreg_master:

	free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);

free_irq:

	iounmap(mpc8xxx_spi->reg_base);

err_probe:

	spi_master_put(master);

err:

drivers/spi/spi-fsl-lib.c

+0 −4
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ int mpc8xxx_spi_remove(struct device *dev) 
	master = dev_get_drvdata(dev);

	mpc8xxx_spi = spi_master_get_devdata(master);



	spi_unregister_master(master);



	free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);



	if (mpc8xxx_spi->spi_remove)

		mpc8xxx_spi->spi_remove(mpc8xxx_spi);

drivers/spi/spi-fsl-spi.c

+8 −13
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ static irqreturn_t fsl_spi_irq(s32 irq, void *context_data) 


static void fsl_spi_remove(struct mpc8xxx_spi *mspi)

{

	iounmap(mspi->reg_base);

	fsl_spi_cpm_free(mspi);

}
@@ -639,10 +638,10 @@ static struct spi_master * fsl_spi_probe(struct device *dev, 
	if (ret)

		goto err_cpm_init;



	mpc8xxx_spi->reg_base = ioremap(mem->start, resource_size(mem));

	mpc8xxx_spi->reg_base = devm_ioremap_resource(dev, mem);

	if (mpc8xxx_spi->reg_base == NULL) {

		ret = -ENOMEM;

		goto err_ioremap;

		goto err_probe;

	}



	if (mpc8xxx_spi->type == TYPE_GRLIB)
@@ -661,11 +660,11 @@ static struct spi_master * fsl_spi_probe(struct device *dev, 
					&mpc8xxx_spi->tx_shift, 8, 1);



	/* Register for SPI Interrupt */

	ret = request_irq(mpc8xxx_spi->irq, fsl_spi_irq,

	ret = devm_request_irq(dev, mpc8xxx_spi->irq, fsl_spi_irq,

			       0, "fsl_spi", mpc8xxx_spi);



	if (ret != 0)

		goto free_irq;

		goto err_probe;



	reg_base = mpc8xxx_spi->reg_base;
@@ -686,20 +685,16 @@ static struct spi_master * fsl_spi_probe(struct device *dev, 


	mpc8xxx_spi_write_reg(&reg_base->mode, regval);



	ret = spi_register_master(master);

	ret = devm_spi_register_master(dev, master);

	if (ret < 0)

		goto unreg_master;

		goto err_probe;



	dev_info(dev, "at 0x%p (irq = %d), %s mode\n", reg_base,

		 mpc8xxx_spi->irq, mpc8xxx_spi_strmode(mpc8xxx_spi->flags));



	return master;



unreg_master:

	free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);

free_irq:

	iounmap(mpc8xxx_spi->reg_base);

err_ioremap:

err_probe:

	fsl_spi_cpm_free(mpc8xxx_spi);

err_cpm_init:

	spi_master_put(master);