projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
[cascardo/linux.git]
/
drivers
/
ata
/
pata_imx.c
diff --git
a/drivers/ata/pata_imx.c
b/drivers/ata/pata_imx.c
index
c5af97f
..
87bb05b
100644
(file)
--- a/
drivers/ata/pata_imx.c
+++ b/
drivers/ata/pata_imx.c
@@
-118,7
+118,7
@@
static int __devinit pata_imx_probe(struct platform_device *pdev)
return PTR_ERR(priv->clk);
}
return PTR_ERR(priv->clk);
}
- clk_enable(priv->clk);
+ clk_
prepare_
enable(priv->clk);
host = ata_host_alloc(&pdev->dev, 1);
if (!host)
host = ata_host_alloc(&pdev->dev, 1);
if (!host)
@@
-162,7
+162,7
@@
static int __devinit pata_imx_probe(struct platform_device *pdev)
&pata_imx_sht);
free_priv:
&pata_imx_sht);
free_priv:
- clk_disable(priv->clk);
+ clk_disable
_unprepare
(priv->clk);
clk_put(priv->clk);
return -ENOMEM;
}
clk_put(priv->clk);
return -ENOMEM;
}
@@
-176,7
+176,7
@@
static int __devexit pata_imx_remove(struct platform_device *pdev)
__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
- clk_disable(priv->clk);
+ clk_disable
_unprepare
(priv->clk);
clk_put(priv->clk);
return 0;
clk_put(priv->clk);
return 0;
@@
-194,7
+194,7
@@
static int pata_imx_suspend(struct device *dev)
__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
priv->ata_ctl =
__raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL);
__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
priv->ata_ctl =
__raw_readl(priv->host_regs + PATA_IMX_ATA_CONTROL);
- clk_disable(priv->clk);
+ clk_disable
_unprepare
(priv->clk);
}
return ret;
}
return ret;
@@
-205,7
+205,7
@@
static int pata_imx_resume(struct device *dev)
struct ata_host *host = dev_get_drvdata(dev);
struct pata_imx_priv *priv = host->private_data;
struct ata_host *host = dev_get_drvdata(dev);
struct pata_imx_priv *priv = host->private_data;
- clk_enable(priv->clk);
+ clk_
prepare_
enable(priv->clk);
__raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL);
__raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL);