Commit b8bb45cb authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/dmam' into for-linus

parents edc329fb a436ff1e

drivers/dma/dma-jz4780.c

+2 −6
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int jz4780_dma_probe(struct platform_device *pdev) 
		jzchan->vchan.desc_free = jz4780_dma_desc_free;

	}



	ret = dma_async_device_register(dd);

	ret = dmaenginem_async_device_register(dd);

	if (ret) {

		dev_err(dev, "failed to register device\n");

		goto err_disable_clk;
@@ -858,15 +858,12 @@ static int jz4780_dma_probe(struct platform_device *pdev) 
					 jzdma);

	if (ret) {

		dev_err(dev, "failed to register OF DMA controller\n");

		goto err_unregister_dev;

		goto err_disable_clk;

	}



	dev_info(dev, "JZ4780 DMA controller initialised\n");

	return 0;



err_unregister_dev:

	dma_async_device_unregister(dd);



err_disable_clk:

	clk_disable_unprepare(jzdma->clk);
@@ -887,7 +884,6 @@ static int jz4780_dma_remove(struct platform_device *pdev) 
	for (i = 0; i < JZ_DMA_NR_CHANNELS; i++)

		tasklet_kill(&jzdma->chan[i].vchan.task);



	dma_async_device_unregister(&jzdma->dma_device);

	return 0;

}

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+1 −3
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static int dw_probe(struct platform_device *pdev) 


	pm_runtime_put(chip->dev);



	ret = dma_async_device_register(&dw->dma);

	ret = dmaenginem_async_device_register(&dw->dma);

	if (ret)

		goto err_pm_disable;
@@ -977,8 +977,6 @@ static int dw_remove(struct platform_device *pdev) 
		tasklet_kill(&chan->vc.task);

	}



	dma_async_device_unregister(&dw->dma);



	return 0;

}

drivers/dma/mmp_tdma.c

+2 −5
Original line number Diff line number Diff line
@@ -548,9 +548,6 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan) 


static int mmp_tdma_remove(struct platform_device *pdev)

{

	struct mmp_tdma_device *tdev = platform_get_drvdata(pdev);



	dma_async_device_unregister(&tdev->device);

	return 0;

}
@@ -714,7 +711,7 @@ static int mmp_tdma_probe(struct platform_device *pdev) 
	dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));

	platform_set_drvdata(pdev, tdev);



	ret = dma_async_device_register(&tdev->device);

	ret = dmaenginem_async_device_register(&tdev->device);

	if (ret) {

		dev_err(tdev->device.dev, "unable to register\n");

		return ret;
@@ -726,7 +723,7 @@ static int mmp_tdma_probe(struct platform_device *pdev) 
		if (ret) {

			dev_err(tdev->device.dev,

				"failed to register controller\n");

			dma_async_device_unregister(&tdev->device);

			return ret;

		}

	}

drivers/dma/mxs-dma.c

+1 −2
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	mxs_dma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;

	mxs_dma->dma_device.device_issue_pending = mxs_dma_enable_chan;



	ret = dma_async_device_register(&mxs_dma->dma_device);

	ret = dmaenginem_async_device_register(&mxs_dma->dma_device);

	if (ret) {

		dev_err(mxs_dma->dma_device.dev, "unable to register\n");

		return ret;
@@ -857,7 +857,6 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(mxs_dma->dma_device.dev,

			"failed to register controller\n");

		dma_async_device_unregister(&mxs_dma->dma_device);

	}



	dev_info(mxs_dma->dma_device.dev, "initialized\n");

drivers/dma/pxa_dma.c

+2 −3
Original line number Diff line number Diff line
@@ -1285,7 +1285,6 @@ static int pxad_remove(struct platform_device *op) 


	pxad_cleanup_debugfs(pdev);

	pxad_free_channels(&pdev->slave);

	dma_async_device_unregister(&pdev->slave);

	return 0;

}
@@ -1396,7 +1395,7 @@ static int pxad_init_dmadev(struct platform_device *op, 
		init_waitqueue_head(&c->wq_state);

	}



	return dma_async_device_register(&pdev->slave);

	return dmaenginem_async_device_register(&pdev->slave);

}



static int pxad_probe(struct platform_device *op)
@@ -1433,7 +1432,7 @@ static int pxad_probe(struct platform_device *op) 
				 "#dma-requests set to default 32 as missing in OF: %d",

				 ret);

			nb_requestors = 32;

		};

		}

	} else if (pdata && pdata->dma_channels) {

		dma_channels = pdata->dma_channels;

		nb_requestors = pdata->nb_requestors;