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

Commit 498b6145 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David Woodhouse
Browse files

mtd: nand: pxa3xx: Move buffer release code to its own function 



Create a function to release the buffer and the dma channel, thus undoing
what pxa3xx_nand_init_buff() did. This commit makes the code more readable
and will allow to handle non-DMA capable platforms easier.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 1f8eaff2

drivers/mtd/nand/pxa3xx_nand.c

+14 −12
Original line number Diff line number Diff line
@@ -912,6 +912,18 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) 
	return 0;

}



static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)

{

	struct platform_device *pdev = info->pdev;

	if (use_dma) {

		pxa_free_dma(info->data_dma_ch);

		dma_free_coherent(&pdev->dev, MAX_BUFF_SIZE,

				  info->data_buff, info->data_buff_phys);

	} else {

		kfree(info->data_buff);

	}

}



static int pxa3xx_nand_sensing(struct pxa3xx_nand_info *info)

{

	struct mtd_info *mtd;
@@ -1137,12 +1149,7 @@ static int alloc_nand_resource(struct platform_device *pdev) 


fail_free_buf:

	free_irq(irq, info);

	if (use_dma) {

		pxa_free_dma(info->data_dma_ch);

		dma_free_coherent(&pdev->dev, MAX_BUFF_SIZE,

			info->data_buff, info->data_buff_phys);

	} else

		kfree(info->data_buff);

	pxa3xx_nand_free_buff(info);

fail_disable_clk:

	clk_disable_unprepare(info->clk);

	return ret;
@@ -1163,12 +1170,7 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) 
	irq = platform_get_irq(pdev, 0);

	if (irq >= 0)

		free_irq(irq, info);

	if (use_dma) {

		pxa_free_dma(info->data_dma_ch);

		dma_free_writecombine(&pdev->dev, MAX_BUFF_SIZE,

				info->data_buff, info->data_buff_phys);

	} else

		kfree(info->data_buff);

	pxa3xx_nand_free_buff(info);



	clk_disable_unprepare(info->clk);