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

Commit 6d6467ee authored by Hannu Heikkinen's avatar Hannu Heikkinen Committed by Grant Likely
Browse files

spi/ep93xx: clean probe/remove routines 



Use devm_* functions for managing devres resources.

Also use local variable irq and remove irq variable from
struct ep93xx_spi, as it is needed only in probe routine.

Acked-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarHannu Heikkinen <hannuxx@iki.fi>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 3aa450c0

drivers/spi/spi-ep93xx.c

+10 −27
Original line number Original line Diff line number Diff line
@@ -76,7 +76,6 @@ 
 * @clk: clock for the controller

 * @clk: clock for the controller

 * @regs_base: pointer to ioremap()'d registers

 * @regs_base: pointer to ioremap()'d registers

 * @sspdr_phys: physical address of the SSPDR register

 * @sspdr_phys: physical address of the SSPDR register

 * @irq: IRQ number used by the driver

 * @min_rate: minimum clock rate (in Hz) supported by the controller

 * @min_rate: minimum clock rate (in Hz) supported by the controller

 * @max_rate: maximum clock rate (in Hz) supported by the controller

 * @max_rate: maximum clock rate (in Hz) supported by the controller

 * @running: is the queue running

 * @running: is the queue running
@@ -114,7 +113,6 @@ struct ep93xx_spi { 
	struct clk			*clk;

	struct clk			*clk;

	void __iomem			*regs_base;

	void __iomem			*regs_base;

	unsigned long			sspdr_phys;

	unsigned long			sspdr_phys;

	int				irq;

	unsigned long			min_rate;

	unsigned long			min_rate;

	unsigned long			max_rate;

	unsigned long			max_rate;

	bool				running;

	bool				running;
@@ -1031,6 +1029,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev) 
	struct ep93xx_spi_info *info;

	struct ep93xx_spi_info *info;

	struct ep93xx_spi *espi;

	struct ep93xx_spi *espi;

	struct resource *res;

	struct resource *res;

	int irq;

	int error;

	int error;





	info = pdev->dev.platform_data;

	info = pdev->dev.platform_data;
@@ -1070,8 +1069,8 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev) 
	espi->min_rate = clk_get_rate(espi->clk) / (254 * 256);

	espi->min_rate = clk_get_rate(espi->clk) / (254 * 256);

	espi->pdev = pdev;

	espi->pdev = pdev;





	espi->irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (espi->irq < 0) {

	if (irq < 0) {

		error = -EBUSY;

		error = -EBUSY;

		dev_err(&pdev->dev, "failed to get irq resources\n");

		dev_err(&pdev->dev, "failed to get irq resources\n");

		goto fail_put_clock;

		goto fail_put_clock;
@@ -1084,26 +1083,20 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev) 
		goto fail_put_clock;

		goto fail_put_clock;

	}

	}





	res = request_mem_region(res->start, resource_size(res), pdev->name);

	if (!res) {

		dev_err(&pdev->dev, "unable to request iomem resources\n");

		error = -EBUSY;

		goto fail_put_clock;

	}



	espi->sspdr_phys = res->start + SSPDR;

	espi->sspdr_phys = res->start + SSPDR;

	espi->regs_base = ioremap(res->start, resource_size(res));



	espi->regs_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!espi->regs_base) {

	if (!espi->regs_base) {

		dev_err(&pdev->dev, "failed to map resources\n");

		dev_err(&pdev->dev, "failed to map resources\n");

		error = -ENODEV;

		error = -ENODEV;

		goto fail_free_mem;

		goto fail_put_clock;

	}

	}





	error = request_irq(espi->irq, ep93xx_spi_interrupt, 0,

	error = devm_request_irq(&pdev->dev, irq, ep93xx_spi_interrupt,

			    "ep93xx-spi", espi);

				0, "ep93xx-spi", espi);

	if (error) {

	if (error) {

		dev_err(&pdev->dev, "failed to request irq\n");

		dev_err(&pdev->dev, "failed to request irq\n");

		goto fail_unmap_regs;

		goto fail_put_clock;

	}

	}





	if (info->use_dma && ep93xx_spi_setup_dma(espi))

	if (info->use_dma && ep93xx_spi_setup_dma(espi))
@@ -1128,7 +1121,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev) 
	}

	}





	dev_info(&pdev->dev, "EP93xx SPI Controller at 0x%08lx irq %d\n",

	dev_info(&pdev->dev, "EP93xx SPI Controller at 0x%08lx irq %d\n",

		 (unsigned long)res->start, espi->irq);

		 (unsigned long)res->start, irq);





	return 0;

	return 0;
@@ -1136,11 +1129,6 @@ fail_free_queue: 
	destroy_workqueue(espi->wq);

	destroy_workqueue(espi->wq);

fail_free_dma:

fail_free_dma:

	ep93xx_spi_release_dma(espi);

	ep93xx_spi_release_dma(espi);

	free_irq(espi->irq, espi);

fail_unmap_regs:

	iounmap(espi->regs_base);

fail_free_mem:

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

fail_put_clock:

fail_put_clock:

	clk_put(espi->clk);

	clk_put(espi->clk);

fail_release_master:

fail_release_master:
@@ -1154,7 +1142,6 @@ static int __devexit ep93xx_spi_remove(struct platform_device *pdev) 
{

{

	struct spi_master *master = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct ep93xx_spi *espi = spi_master_get_devdata(master);

	struct ep93xx_spi *espi = spi_master_get_devdata(master);

	struct resource *res;





	spin_lock_irq(&espi->lock);

	spin_lock_irq(&espi->lock);

	espi->running = false;

	espi->running = false;
@@ -1180,10 +1167,6 @@ static int __devexit ep93xx_spi_remove(struct platform_device *pdev) 
	spin_unlock_irq(&espi->lock);

	spin_unlock_irq(&espi->lock);





	ep93xx_spi_release_dma(espi);

	ep93xx_spi_release_dma(espi);

	free_irq(espi->irq, espi);

	iounmap(espi->regs_base);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	clk_put(espi->clk);

	clk_put(espi->clk);

	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);