From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 6 Jan 2009 18:38:19 +0000 (-0700)
Subject: iop-adma: let devm do its job, don't duplicate free
X-Git-Tag: v2.6.29-rc1~39^2~8
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=f38822033d9eafd8a7b12dd7ad6dea26480ba339;p=safe%2Fjmp%2Flinux-2.6

iop-adma: let devm do its job, don't duplicate free

No need to free stuff that the devm infrastructure will take care of...

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index df0e37d..0c6bbf5 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1113,26 +1113,13 @@ static int __devexit iop_adma_remove(struct platform_device *dev)
 	struct iop_adma_device *device = platform_get_drvdata(dev);
 	struct dma_chan *chan, *_chan;
 	struct iop_adma_chan *iop_chan;
-	int i;
 	struct iop_adma_platform_data *plat_data = dev->dev.platform_data;
 
 	dma_async_device_unregister(&device->common);
 
-	for (i = 0; i < 3; i++) {
-		unsigned int irq;
-		irq = platform_get_irq(dev, i);
-		free_irq(irq, device);
-	}
-
 	dma_free_coherent(&dev->dev, plat_data->pool_size,
 			device->dma_desc_pool_virt, device->dma_desc_pool);
 
-	do {
-		struct resource *res;
-		res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-		release_mem_region(res->start, res->end - res->start);
-	} while (0);
-
 	list_for_each_entry_safe(chan, _chan, &device->common.channels,
 				device_node) {
 		iop_chan = to_iop_adma_chan(chan);