From ec6b01e5e18f2e5eb9e80bdd5769745554cbef83 Mon Sep 17 00:00:00 2001 From: Saeed Bishara Date: Mon, 18 Feb 2008 07:42:28 -1100 Subject: [PATCH] --- yaml --- r: 86023 b: refs/heads/master c: f1cb0ea12fee23018ad1865bf789cbd463f13747 h: refs/heads/master i: 86021: e8474bf420fef4f7db45432071726a79ea8256c8 86019: 34f6e16f0cf18973ef432ba195ab70f9d5c66098 86015: ba75859c7e4a96454c07ff7a064f086eac591220 v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fd63a6e8beaf..d75d9d8e4b06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d44b414daa8c1d8551aed6130d86d54175db43f +refs/heads/master: f1cb0ea12fee23018ad1865bf789cbd463f13747 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index eb97dde28d47..6ebebde8454a 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -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; }