diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2014-05-07 11:17:44 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-05-09 22:37:49 -0400 |
commit | 58eb8cd565af4a104395e3c10443951c1f73dafe (patch) | |
tree | 127ce4daca1f66218d2b72712c6b4e50ecc740bd /drivers/ata/pata_imx.c | |
parent | a3464ed2f14d19ba923930f7c0c284499d64eb5b (diff) |
ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
This patch fixes host drivers to use CONFIG_PM_SLEEP instead of CONFIG_PM
where applicable. Benefits of this change:
* unused code is not being compiled in for CONFIG_PM=y, CONFIG_PM_SLEEP=n
and CONFIG_PM_RUNTIME=y configurations
* easier transition to use struct dev_pm_ops and SIMPLE_DEV_PM_OPS() in
the future
* more consistent code (there are host drivers which are using the correct
CONFIG_PM_SLEEP checks already)
The patch leaves the core libata code and ->port_[suspend,resume] support
in sata_[inic162x,nv,sil24].c alone for now.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/pata_imx.c')
-rw-r--r-- | drivers/ata/pata_imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c index e0872db913d6..af424573c2ff 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c | |||
@@ -185,7 +185,7 @@ static int pata_imx_remove(struct platform_device *pdev) | |||
185 | return 0; | 185 | return 0; |
186 | } | 186 | } |
187 | 187 | ||
188 | #ifdef CONFIG_PM | 188 | #ifdef CONFIG_PM_SLEEP |
189 | static int pata_imx_suspend(struct device *dev) | 189 | static int pata_imx_suspend(struct device *dev) |
190 | { | 190 | { |
191 | struct ata_host *host = dev_get_drvdata(dev); | 191 | struct ata_host *host = dev_get_drvdata(dev); |
@@ -244,7 +244,7 @@ static struct platform_driver pata_imx_driver = { | |||
244 | .name = DRV_NAME, | 244 | .name = DRV_NAME, |
245 | .of_match_table = imx_pata_dt_ids, | 245 | .of_match_table = imx_pata_dt_ids, |
246 | .owner = THIS_MODULE, | 246 | .owner = THIS_MODULE, |
247 | #ifdef CONFIG_PM | 247 | #ifdef CONFIG_PM_SLEEP |
248 | .pm = &pata_imx_pm_ops, | 248 | .pm = &pata_imx_pm_ops, |
249 | #endif | 249 | #endif |
250 | }, | 250 | }, |