Merge branch 'for-3.7' into next

diff --combined drivers/dma/dw_dmac.c
index d3c5a5a88f1e9af91b97848f6d9c107ac2010da5,ed2c9499d3ea618c220fe43b076945c5e5cb885b..4f4ff1337cacd91c53660ca0a07b6a078a31d455
--- 1/drivers/dma/dw_dmac.c
--- 2/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -1392,26 -1392,17 +1392,17 @@@ static int __devinit dw_probe(struct pl
  
        size = sizeof(struct dw_dma);
        size += pdata->nr_channels * sizeof(struct dw_dma_chan);
-       dw = kzalloc(size, GFP_KERNEL);
+       dw = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
        if (!dw)
                return -ENOMEM;
  
-       if (!request_mem_region(io->start, DW_REGLEN, pdev->dev.driver->name)) {
-               err = -EBUSY;
-               goto err_kfree;
-       }
- 
-       dw->regs = ioremap(io->start, DW_REGLEN);
-       if (!dw->regs) {
-               err = -ENOMEM;
-               goto err_release_r;
-       }
+       dw->regs = devm_request_and_ioremap(&pdev->dev, io);
+       if (!dw->regs)
+               return -EBUSY;
  
-       dw->clk = clk_get(&pdev->dev, "hclk");
-       if (IS_ERR(dw->clk)) {
-               err = PTR_ERR(dw->clk);
-               goto err_clk;
-       }
+       dw->clk = devm_clk_get(&pdev->dev, "hclk");
+       if (IS_ERR(dw->clk))
+               return PTR_ERR(dw->clk);
        clk_prepare_enable(dw->clk);
  
        /* Calculate all channel mask before DMA setup */
@@@ -1423,9 -1414,10 +1414,10 @@@
        /* disable BLOCK interrupts as well */
        channel_clear_bit(dw, MASK.BLOCK, dw->all_chan_mask);
  
-       err = request_irq(irq, dw_dma_interrupt, 0, "dw_dmac", dw);
+       err = devm_request_irq(&pdev->dev, irq, dw_dma_interrupt, 0,
+                              "dw_dmac", dw);
        if (err)
-               goto err_irq;
+               return err;
  
        platform_set_drvdata(pdev, dw);
  
@@@ -1491,30 -1483,16 +1483,16 @@@
        dma_async_device_register(&dw->dma);
  
        return 0;
- 
- err_irq:
-       clk_disable_unprepare(dw->clk);
-       clk_put(dw->clk);
- err_clk:
-       iounmap(dw->regs);
-       dw->regs = NULL;
- err_release_r:
-       release_resource(io);
- err_kfree:
-       kfree(dw);
-       return err;
  }
  
  static int __devexit dw_remove(struct platform_device *pdev)
  {
        struct dw_dma           *dw = platform_get_drvdata(pdev);
        struct dw_dma_chan      *dwc, *_dwc;
-       struct resource         *io;
  
        dw_dma_off(dw);
        dma_async_device_unregister(&dw->dma);
  
-       free_irq(platform_get_irq(pdev, 0), dw);
        tasklet_kill(&dw->tasklet);
  
        list_for_each_entry_safe(dwc, _dwc, &dw->dma.channels,
@@@ -1523,17 -1501,6 +1501,6 @@@
                channel_clear_bit(dw, CH_EN, dwc->mask);
        }
  
-       clk_disable_unprepare(dw->clk);
-       clk_put(dw->clk);
- 
-       iounmap(dw->regs);
-       dw->regs = NULL;
- 
-       io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(io->start, DW_REGLEN);
- 
-       kfree(dw);
- 
        return 0;
  }
  
@@@ -1608,4 -1575,4 +1575,4 @@@ module_exit(dw_exit)
  MODULE_LICENSE("GPL v2");
  MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
  MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
 -MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
 +MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>");