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

Commit aaa20517 authored by Shawn Guo's avatar Shawn Guo
Browse files

dma: mxs-dma: use devm_* managed functions 



Use devm_* managed functions to simplify probe() error handling.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f30fb03d

drivers/dma/mxs-dma.c

+9 −30
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	struct resource *iores;

	int ret, i;



	mxs_dma = kzalloc(sizeof(*mxs_dma), GFP_KERNEL);

	mxs_dma = devm_kzalloc(&pdev->dev, sizeof(*mxs_dma), GFP_KERNEL);

	if (!mxs_dma)

		return -ENOMEM;
@@ -689,24 +689,13 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	mxs_dma->dev_id = dma_type->id;



	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mxs_dma->base = devm_ioremap_resource(&pdev->dev, iores);

	if (IS_ERR(mxs_dma->base))

		return PTR_ERR(mxs_dma->base);



	if (!request_mem_region(iores->start, resource_size(iores),

				pdev->name)) {

		ret = -EBUSY;

		goto err_request_region;

	}



	mxs_dma->base = ioremap(iores->start, resource_size(iores));

	if (!mxs_dma->base) {

		ret = -ENOMEM;

		goto err_ioremap;

	}



	mxs_dma->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(mxs_dma->clk)) {

		ret = PTR_ERR(mxs_dma->clk);

		goto err_clk;

	}

	mxs_dma->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(mxs_dma->clk))

		return PTR_ERR(mxs_dma->clk);



	dma_cap_set(DMA_SLAVE, mxs_dma->dma_device.cap_mask);

	dma_cap_set(DMA_CYCLIC, mxs_dma->dma_device.cap_mask);
@@ -732,7 +721,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 


	ret = mxs_dma_init(mxs_dma);

	if (ret)

		goto err_init;

		return ret;



	mxs_dma->dma_device.dev = &pdev->dev;
@@ -751,22 +740,12 @@ static int __init mxs_dma_probe(struct platform_device *pdev) 
	ret = dma_async_device_register(&mxs_dma->dma_device);

	if (ret) {

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

		goto err_init;

		return ret;

	}



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



	return 0;



err_init:

	clk_put(mxs_dma->clk);

err_clk:

	iounmap(mxs_dma->base);

err_ioremap:

	release_mem_region(iores->start, resource_size(iores));

err_request_region:

	kfree(mxs_dma);

	return ret;

}



static struct platform_driver mxs_dma_driver = {