dmaengine: sf-pdma: Simplify the error handling path in 'sf_pdma_probe()' (f2b5d503) · Commits · 戴 / test

drivers/dma/sf-pdma/sf-pdma.c

+7 −18

Original line number	Diff line number	Diff line
		@@ -506,11 +506,11 @@ static int sf_pdma_probe(struct platform_device *pdev)
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		pdma->membase = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(pdma->membase))
		goto ERR_MEMBASE;
		return PTR_ERR(pdma->membase);

		ret = sf_pdma_irq_init(pdev, pdma);
		if (ret)
		goto ERR_INITIRQ;
		return ret;

		sf_pdma_setup_chans(pdma);

		@@ -544,26 +544,15 @@ static int sf_pdma_probe(struct platform_device *pdev)
		"Failed to set DMA mask. Fall back to default.\n");

		ret = dma_async_device_register(&pdma->dma_dev);
		if (ret)
		goto ERR_REG_DMADEVICE;

		return 0;

		ERR_MEMBASE:
		devm_kfree(&pdev->dev, pdma);
		return PTR_ERR(pdma->membase);

		ERR_INITIRQ:
		devm_kfree(&pdev->dev, pdma);
		return ret;

		ERR_REG_DMADEVICE:
		devm_kfree(&pdev->dev, pdma);
		if (ret) {
		dev_err(&pdev->dev,
		"Can't register SiFive Platform DMA. (%d)\n", ret);
		return ret;
		}

		return 0;
		}

		static int sf_pdma_remove(struct platform_device *pdev)
		{
		struct sf_pdma *pdma = platform_get_drvdata(pdev);