From 237d79823a0c5b6c82f9f3201ab048dcfd4dc9c8 Mon Sep 17 00:00:00 2001 From: Balaji T K Date: Fri, 1 Jul 2011 22:09:36 +0530 Subject: [PATCH] --- yaml --- r: 255226 b: refs/heads/master c: 101ed47e01516adeffeb4769df77b9207e6ba48a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 03b12c4bcceb..ffd80cd6cdf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa4aa2d48dabed9d1288d235524cb8d0a8e81c00 +refs/heads/master: 101ed47e01516adeffeb4769df77b9207e6ba48a diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index 10122b1cc424..6416828d2cdc 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -150,7 +150,6 @@ struct omap_hsmmc_host { struct mmc_command *cmd; struct mmc_data *data; struct clk *fclk; - struct clk *iclk; struct clk *dbclk; /* * vcc == configured supply @@ -1935,17 +1934,10 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) spin_lock_init(&host->irq_lock); - host->iclk = clk_get(&pdev->dev, "ick"); - if (IS_ERR(host->iclk)) { - ret = PTR_ERR(host->iclk); - host->iclk = NULL; - goto err1; - } host->fclk = clk_get(&pdev->dev, "fck"); if (IS_ERR(host->fclk)) { ret = PTR_ERR(host->fclk); host->fclk = NULL; - clk_put(host->iclk); goto err1; } @@ -2103,7 +2095,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) pm_runtime_mark_last_busy(host->dev); pm_runtime_put_autosuspend(host->dev); clk_put(host->fclk); - clk_put(host->iclk); if (host->got_dbclk) { clk_disable(host->dbclk); clk_put(host->dbclk); @@ -2139,7 +2130,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev) pm_runtime_put_sync(host->dev); pm_runtime_disable(host->dev); clk_put(host->fclk); - clk_put(host->iclk); if (host->got_dbclk) { clk_disable(host->dbclk); clk_put(host->dbclk);