From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Tue, 5 Aug 2008 14:05:51 +0000 (+0300)
Subject: Get rid of old usb_init prototypes for OMAP3430
X-Git-Tag: v2.6.26-omap1~16
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=040378c1b24ace3b8945318a8c24ef218200912c;p=linux-2.6-omap-h63xx.git

Get rid of old usb_init prototypes for OMAP3430

arch: omap: get rid of usb_init() protytpes

we now use usb_musb_init() and usb_ehci_init() functions

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index c825cad52a0..a8316ffdbbe 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -764,23 +764,27 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 	if (IS_ERR(host->iclk)) {
 		ret = PTR_ERR(host->iclk);
 		host->iclk = NULL;
-		goto err;
+		goto err1;
 	}
 	host->fclk = clk_get(&pdev->dev, "mmchs_fck");
 	if (IS_ERR(host->fclk)) {
 		ret = PTR_ERR(host->fclk);
 		host->fclk = NULL;
 		clk_put(host->iclk);
-		goto err;
+		goto err1;
 	}
 
-	if (clk_enable(host->fclk) != 0)
-		goto err;
+	if (clk_enable(host->fclk) != 0) {
+		clk_put(host->iclk);
+		clk_put(host->fclk);
+		goto err1;
+	}
 
 	if (clk_enable(host->iclk) != 0) {
 		clk_disable(host->fclk);
+		clk_put(host->iclk);
 		clk_put(host->fclk);
-		goto err;
+		goto err1;
 	}
 
 	host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
@@ -873,12 +877,6 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 
 	return 0;
 
-err:
-	dev_dbg(mmc_dev(host->mmc), "Probe Failed\n");
-	if (host)
-		mmc_free_host(mmc);
-	return ret;
-
 irq_err:
 	dev_dbg(mmc_dev(host->mmc), "Unable to configure MMC IRQs\n");
 	clk_disable(host->fclk);
@@ -890,6 +888,11 @@ irq_err:
 		clk_put(host->dbclk);
 	}
 
+err1:
+	iounmap(host->base);
+err:
+	dev_dbg(mmc_dev(host->mmc), "Probe Failed\n");
+	release_mem_region(res->start, res->end - res->start + 1);
 	if (host)
 		mmc_free_host(mmc);
 	return ret;
@@ -918,6 +921,7 @@ static int omap_mmc_remove(struct platform_device *pdev)
 		}
 
 		mmc_free_host(host->mmc);
+		iounmap(host->base);
 	}
 
 	return 0;