Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dma: mxs-dma: use devm_* managed functions

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

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>

Shawn Guo aaa20517 f30fb03d

+9 -30
+9 -30
drivers/dma/mxs-dma.c
··· 674 674 struct resource *iores; 675 675 int ret, i; 676 676 677 - mxs_dma = kzalloc(sizeof(*mxs_dma), GFP_KERNEL); 677 + mxs_dma = devm_kzalloc(&pdev->dev, sizeof(*mxs_dma), GFP_KERNEL); 678 678 if (!mxs_dma) 679 679 return -ENOMEM; 680 680 ··· 689 689 mxs_dma->dev_id = dma_type->id; 690 690 691 691 iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); 692 + mxs_dma->base = devm_ioremap_resource(&pdev->dev, iores); 693 + if (IS_ERR(mxs_dma->base)) 694 + return PTR_ERR(mxs_dma->base); 692 695 693 - if (!request_mem_region(iores->start, resource_size(iores), 694 - pdev->name)) { 695 - ret = -EBUSY; 696 - goto err_request_region; 697 - } 698 - 699 - mxs_dma->base = ioremap(iores->start, resource_size(iores)); 700 - if (!mxs_dma->base) { 701 - ret = -ENOMEM; 702 - goto err_ioremap; 703 - } 704 - 705 - mxs_dma->clk = clk_get(&pdev->dev, NULL); 706 - if (IS_ERR(mxs_dma->clk)) { 707 - ret = PTR_ERR(mxs_dma->clk); 708 - goto err_clk; 709 - } 696 + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); 697 + if (IS_ERR(mxs_dma->clk)) 698 + return PTR_ERR(mxs_dma->clk); 710 699 711 700 dma_cap_set(DMA_SLAVE, mxs_dma->dma_device.cap_mask); 712 701 dma_cap_set(DMA_CYCLIC, mxs_dma->dma_device.cap_mask); ··· 721 732 722 733 ret = mxs_dma_init(mxs_dma); 723 734 if (ret) 724 - goto err_init; 735 + return ret; 725 736 726 737 mxs_dma->dma_device.dev = &pdev->dev; 727 738 ··· 740 751 ret = dma_async_device_register(&mxs_dma->dma_device); 741 752 if (ret) { 742 753 dev_err(mxs_dma->dma_device.dev, "unable to register\n"); 743 - goto err_init; 754 + return ret; 744 755 } 745 756 746 757 dev_info(mxs_dma->dma_device.dev, "initialized\n"); 747 758 748 759 return 0; 749 - 750 - err_init: 751 - clk_put(mxs_dma->clk); 752 - err_clk: 753 - iounmap(mxs_dma->base); 754 - err_ioremap: 755 - release_mem_region(iores->start, resource_size(iores)); 756 - err_request_region: 757 - kfree(mxs_dma); 758 - return ret; 759 760 } 760 761 761 762 static struct platform_driver mxs_dma_driver = {