]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sata_mv: remove iounmap in mv_platform_remove and use devm_iomap
authorSaeed Bishara <saeed@marvell.com>
Mon, 18 Feb 2008 18:42:28 +0000 (07:42 -1100)
committerJeff Garzik <jeff@garzik.org>
Wed, 20 Feb 2008 17:20:46 +0000 (12:20 -0500)
this will fix crash bug when doing rmmod to the driver, this is because the
port_stop function get called later and it could access the device's registers.

Signed-off-by: Saeed Bishara <saeed@marvell.com>
Acked-by: Mark Lord <mlord@pobox.com>
Acked-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/sata_mv.c

index eb97dde28d47ca72b755d8c496642e21ff3fc842..6ebebde8454a939b3e564c15998cd624ca363261 100644 (file)
@@ -2947,7 +2947,8 @@ static int mv_platform_probe(struct platform_device *pdev)
        hpriv->n_ports = n_ports;
 
        host->iomap = NULL;
-       hpriv->base = ioremap(res->start, res->end - res->start + 1);
+       hpriv->base = devm_ioremap(&pdev->dev, res->start,
+                                  res->end - res->start + 1);
        hpriv->base -= MV_SATAHC0_REG_BASE;
 
        rc = mv_create_dma_pools(hpriv, &pdev->dev);
@@ -2979,11 +2980,8 @@ static int __devexit mv_platform_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct ata_host *host = dev_get_drvdata(dev);
-       struct mv_host_priv *hpriv = host->private_data;
-       void __iomem *base = hpriv->base;
 
        ata_host_detach(host);
-       iounmap(base);
        return 0;
 }