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

Commit 717d8181 authored by Daniel Mack's avatar Daniel Mack Committed by Vinod Koul
Browse files

dma: cppi41: add shortcut to &pdev->dev in cppi41_dma_probe() 



Makes the code more readable and compact. No functional change.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent b46ce4d0

drivers/dma/cppi41.c

+17 −16
Original line number Diff line number Diff line
@@ -927,11 +927,12 @@ static const struct cppi_glue_infos *get_glue_info(struct device *dev) 
static int cppi41_dma_probe(struct platform_device *pdev)

{

	struct cppi41_dd *cdd;

	struct device *dev = &pdev->dev;

	const struct cppi_glue_infos *glue_info;

	int irq;

	int ret;



	glue_info = get_glue_info(&pdev->dev);

	glue_info = get_glue_info(dev);

	if (!glue_info)

		return -EINVAL;
@@ -946,14 +947,14 @@ static int cppi41_dma_probe(struct platform_device *pdev) 
	cdd->ddev.device_issue_pending = cppi41_dma_issue_pending;

	cdd->ddev.device_prep_slave_sg = cppi41_dma_prep_slave_sg;

	cdd->ddev.device_control = cppi41_dma_control;

	cdd->ddev.dev = &pdev->dev;

	cdd->ddev.dev = dev;

	INIT_LIST_HEAD(&cdd->ddev.channels);

	cpp41_dma_info.dma_cap = cdd->ddev.cap_mask;



	cdd->usbss_mem = of_iomap(pdev->dev.of_node, 0);

	cdd->ctrl_mem = of_iomap(pdev->dev.of_node, 1);

	cdd->sched_mem = of_iomap(pdev->dev.of_node, 2);

	cdd->qmgr_mem = of_iomap(pdev->dev.of_node, 3);

	cdd->usbss_mem = of_iomap(dev->of_node, 0);

	cdd->ctrl_mem = of_iomap(dev->of_node, 1);

	cdd->sched_mem = of_iomap(dev->of_node, 2);

	cdd->qmgr_mem = of_iomap(dev->of_node, 3);



	if (!cdd->usbss_mem || !cdd->ctrl_mem || !cdd->sched_mem ||

			!cdd->qmgr_mem) {
@@ -961,8 +962,8 @@ static int cppi41_dma_probe(struct platform_device *pdev) 
		goto err_remap;

	}



	pm_runtime_enable(&pdev->dev);

	ret = pm_runtime_get_sync(&pdev->dev);

	pm_runtime_enable(dev);

	ret = pm_runtime_get_sync(dev);

	if (ret)

		goto err_get_sync;
@@ -970,22 +971,22 @@ static int cppi41_dma_probe(struct platform_device *pdev) 
	cdd->queues_tx = glue_info->queues_tx;

	cdd->td_queue = glue_info->td_queue;



	ret = init_cppi41(&pdev->dev, cdd);

	ret = init_cppi41(dev, cdd);

	if (ret)

		goto err_init_cppi;



	ret = cppi41_add_chans(&pdev->dev, cdd);

	ret = cppi41_add_chans(dev, cdd);

	if (ret)

		goto err_chans;



	irq = irq_of_parse_and_map(pdev->dev.of_node, 0);

	irq = irq_of_parse_and_map(dev->of_node, 0);

	if (!irq)

		goto err_irq;



	cppi_writel(USBSS_IRQ_PD_COMP, cdd->usbss_mem + USBSS_IRQ_ENABLER);



	ret = request_irq(irq, glue_info->isr, IRQF_SHARED,

			dev_name(&pdev->dev), cdd);

			dev_name(dev), cdd);

	if (ret)

		goto err_irq;

	cdd->irq = irq;
@@ -994,7 +995,7 @@ static int cppi41_dma_probe(struct platform_device *pdev) 
	if (ret)

		goto err_dma_reg;



	ret = of_dma_controller_register(pdev->dev.of_node,

	ret = of_dma_controller_register(dev->of_node,

			cppi41_dma_xlate, &cpp41_dma_info);

	if (ret)

		goto err_of;
@@ -1009,11 +1010,11 @@ static int cppi41_dma_probe(struct platform_device *pdev) 
	cppi_writel(0, cdd->usbss_mem + USBSS_IRQ_CLEARR);

	cleanup_chans(cdd);

err_chans:

	deinit_cppi41(&pdev->dev, cdd);

	deinit_cppi41(dev, cdd);

err_init_cppi:

	pm_runtime_put(&pdev->dev);

	pm_runtime_put(dev);

err_get_sync:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(dev);

	iounmap(cdd->usbss_mem);

	iounmap(cdd->ctrl_mem);

	iounmap(cdd->sched_mem);