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

Commit 10c191a1 authored by Romain Perier's avatar Romain Perier Committed by Vinod Koul
Browse files

dmaengine: pch_dma: Replace PCI pool old API 



The PCI pool API is deprecated. This commit replaces the PCI pool old
API by the appropriate function with the DMA pool API.

Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Acked-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Tested-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 2bd6bf03

drivers/dma/pch_dma.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ struct pch_dma_chan { 
struct pch_dma {

struct pch_dma {

	struct dma_device	dma;

	struct dma_device	dma;

	void __iomem *membase;

	void __iomem *membase;

	struct pci_pool		*pool;

	struct dma_pool		*pool;

	struct pch_dma_regs	regs;

	struct pch_dma_regs	regs;

	struct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];

	struct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];

	struct pch_dma_chan	channels[MAX_CHAN_NR];

	struct pch_dma_chan	channels[MAX_CHAN_NR];
@@ -437,7 +437,7 @@ static struct pch_dma_desc *pdc_alloc_desc(struct dma_chan *chan, gfp_t flags) 
	struct pch_dma *pd = to_pd(chan->device);

	struct pch_dma *pd = to_pd(chan->device);

	dma_addr_t addr;

	dma_addr_t addr;





	desc = pci_pool_zalloc(pd->pool, flags, &addr);

	desc = dma_pool_zalloc(pd->pool, flags, &addr);

	if (desc) {

	if (desc) {

		INIT_LIST_HEAD(&desc->tx_list);

		INIT_LIST_HEAD(&desc->tx_list);

		dma_async_tx_descriptor_init(&desc->txd, chan);

		dma_async_tx_descriptor_init(&desc->txd, chan);
@@ -549,7 +549,7 @@ static void pd_free_chan_resources(struct dma_chan *chan) 
	spin_unlock_irq(&pd_chan->lock);

	spin_unlock_irq(&pd_chan->lock);





	list_for_each_entry_safe(desc, _d, &tmp_list, desc_node)

	list_for_each_entry_safe(desc, _d, &tmp_list, desc_node)

		pci_pool_free(pd->pool, desc, desc->txd.phys);

		dma_pool_free(pd->pool, desc, desc->txd.phys);





	pdc_enable_irq(chan, 0);

	pdc_enable_irq(chan, 0);

}

}
@@ -880,7 +880,7 @@ static int pch_dma_probe(struct pci_dev *pdev, 
		goto err_iounmap;

		goto err_iounmap;

	}

	}





	pd->pool = pci_pool_create("pch_dma_desc_pool", pdev,

	pd->pool = dma_pool_create("pch_dma_desc_pool", &pdev->dev,

				   sizeof(struct pch_dma_desc), 4, 0);

				   sizeof(struct pch_dma_desc), 4, 0);

	if (!pd->pool) {

	if (!pd->pool) {

		dev_err(&pdev->dev, "Failed to alloc DMA descriptors\n");

		dev_err(&pdev->dev, "Failed to alloc DMA descriptors\n");
@@ -931,7 +931,7 @@ static int pch_dma_probe(struct pci_dev *pdev, 
	return 0;

	return 0;





err_free_pool:

err_free_pool:

	pci_pool_destroy(pd->pool);

	dma_pool_destroy(pd->pool);

err_free_irq:

err_free_irq:

	free_irq(pdev->irq, pd);

	free_irq(pdev->irq, pd);

err_iounmap:

err_iounmap:
@@ -963,7 +963,7 @@ static void pch_dma_remove(struct pci_dev *pdev) 
			tasklet_kill(&pd_chan->tasklet);

			tasklet_kill(&pd_chan->tasklet);

		}

		}





		pci_pool_destroy(pd->pool);

		dma_pool_destroy(pd->pool);

		pci_iounmap(pdev, pd->membase);

		pci_iounmap(pdev, pd->membase);

		pci_release_regions(pdev);

		pci_release_regions(pdev);

		pci_disable_device(pdev);

		pci_disable_device(pdev);