1 files changed, 27 insertions, 8 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f7626e37d0b8..88afc48c2ca7 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1334,7 +1334,7 @@ err_firmware:
         release_firmware(fw);
 }
 
-static int __init sdma_get_firmware(struct sdma_engine *sdma,
+static int sdma_get_firmware(struct sdma_engine *sdma,
                 const char *fw_name)
 {
         int ret;
@@ -1448,7 +1448,7 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec,
         return dma_request_channel(mask, sdma_filter_fn, &data);
 }
 
-static int __init sdma_probe(struct platform_device *pdev)
+static int sdma_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                         of_match_device(sdma_dt_ids, &pdev->dev);
@@ -1603,6 +1603,8 @@ static int __init sdma_probe(struct platform_device *pdev)
         sdma->dma_device.dev->dma_parms = &sdma->dma_parms;
         dma_set_max_seg_size(sdma->dma_device.dev, 65535);
 
+        platform_set_drvdata(pdev, sdma);
+
         ret = dma_async_device_register(&sdma->dma_device);
         if (ret) {
                 dev_err(&pdev->dev, "unable to register\n");
@@ -1640,7 +1642,27 @@ err_irq:
 
 static int sdma_remove(struct platform_device *pdev)
 {
-        return -EBUSY;
+        struct sdma_engine *sdma = platform_get_drvdata(pdev);
+        struct resource *iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        int irq = platform_get_irq(pdev, 0);
+        int i;
+
+        dma_async_device_unregister(&sdma->dma_device);
+        kfree(sdma->script_addrs);
+        free_irq(irq, sdma);
+        iounmap(sdma->regs);
+        release_mem_region(iores->start, resource_size(iores));
+        /* Kill the tasklet */
+        for (i = 0; i < MAX_DMA_CHANNELS; i++) {
+                struct sdma_channel *sdmac = &sdma->channel[i];
+
+                tasklet_kill(&sdmac->tasklet);
+        }
+        kfree(sdma);
+
+        platform_set_drvdata(pdev, NULL);
+        dev_info(&pdev->dev, "Removed...\n");
+        return 0;
 }
 
 static struct platform_driver sdma_driver = {
@@ -1650,13 +1672,10 @@ static struct platform_driver sdma_driver = {
         },
         .id_table       = sdma_devtypes,
         .remove         = sdma_remove,
+        .probe          = sdma_probe,
 };
 
-static int __init sdma_module_init(void)
-{
-        return platform_driver_probe(&sdma_driver, sdma_probe);
-}
-module_init(sdma_module_init);
+module_platform_driver(sdma_driver);
 
 MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
 MODULE_DESCRIPTION("i.MX SDMA driver");