Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 58eb8cd5 编写于 作者: B Bartlomiej Zolnierkiewicz 提交者： Tejun Heo
浏览文件
操作

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: NBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: NTejun Heo <tj@kernel.org>
上级 a3464ed2
隐藏空白更改
内联 并排
Showing with 113 addition and 120 deletion
drivers/ata/acard-ahci.c
浏览文件 @ 58eb8cd5
...@@ -77,7 +77,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc); ...@@ -77,7 +77,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc);
static int acard_ahci_port_start(struct ata_port *ap); static int acard_ahci_port_start(struct ata_port *ap);
static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg); static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
static int acard_ahci_pci_device_resume(struct pci_dev *pdev); static int acard_ahci_pci_device_resume(struct pci_dev *pdev);
#endif #endif
...@@ -118,13 +118,13 @@ static struct pci_driver acard_ahci_pci_driver = { ...@@ -118,13 +118,13 @@ static struct pci_driver acard_ahci_pci_driver = {
.id_table = acard_ahci_pci_tbl, .id_table = acard_ahci_pci_tbl,
.probe = acard_ahci_init_one, .probe = acard_ahci_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = acard_ahci_pci_device_suspend, .suspend = acard_ahci_pci_device_suspend,
.resume = acard_ahci_pci_device_resume, .resume = acard_ahci_pci_device_resume,
#endif #endif
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
......
drivers/ata/ata_generic.c
浏览文件 @ 58eb8cd5
...@@ -241,7 +241,7 @@ static struct pci_driver ata_generic_pci_driver = { ...@@ -241,7 +241,7 @@ static struct pci_driver ata_generic_pci_driver = {
.id_table = ata_generic, .id_table = ata_generic,
.probe = ata_generic_init_one, .probe = ata_generic_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/ata_piix.c
浏览文件 @ 58eb8cd5
...@@ -830,7 +830,7 @@ static bool piix_irq_check(struct ata_port *ap) ...@@ -830,7 +830,7 @@ static bool piix_irq_check(struct ata_port *ap)
return ap->ops->bmdma_status(ap) & ATA_DMA_INTR; return ap->ops->bmdma_status(ap) & ATA_DMA_INTR;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int piix_broken_suspend(void) static int piix_broken_suspend(void)
{ {
static const struct dmi_system_id sysids[] = { static const struct dmi_system_id sysids[] = {
...@@ -1767,7 +1767,7 @@ static struct pci_driver piix_pci_driver = { ...@@ -1767,7 +1767,7 @@ static struct pci_driver piix_pci_driver = {
.id_table = piix_pci_tbl, .id_table = piix_pci_tbl,
.probe = piix_init_one, .probe = piix_init_one,
.remove = piix_remove_one, .remove = piix_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = piix_pci_device_suspend, .suspend = piix_pci_device_suspend,
.resume = piix_pci_device_resume, .resume = piix_pci_device_resume,
#endif #endif
......
drivers/ata/pata_acpi.c
浏览文件 @ 58eb8cd5
...@@ -265,7 +265,7 @@ static struct pci_driver pacpi_pci_driver = { ...@@ -265,7 +265,7 @@ static struct pci_driver pacpi_pci_driver = {
.id_table = pacpi_pci_tbl, .id_table = pacpi_pci_tbl,
.probe = pacpi_init_one, .probe = pacpi_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_ali.c
浏览文件 @ 58eb8cd5
...@@ -589,7 +589,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -589,7 +589,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &ali_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &ali_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int ali_reinit_one(struct pci_dev *pdev) static int ali_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -616,7 +616,7 @@ static struct pci_driver ali_pci_driver = { ...@@ -616,7 +616,7 @@ static struct pci_driver ali_pci_driver = {
.id_table = ali, .id_table = ali,
.probe = ali_init_one, .probe = ali_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ali_reinit_one, .resume = ali_reinit_one,
#endif #endif
......
drivers/ata/pata_amd.c
浏览文件 @ 58eb8cd5
...@@ -574,7 +574,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -574,7 +574,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0); return ata_pci_bmdma_init_one(pdev, ppi, &amd_sht, hpriv, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int amd_reinit_one(struct pci_dev *pdev) static int amd_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -625,7 +625,7 @@ static struct pci_driver amd_pci_driver = { ...@@ -625,7 +625,7 @@ static struct pci_driver amd_pci_driver = {
.id_table = amd, .id_table = amd,
.probe = amd_init_one, .probe = amd_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = amd_reinit_one, .resume = amd_reinit_one,
#endif #endif
......
drivers/ata/pata_artop.c
浏览文件 @ 58eb8cd5
...@@ -422,7 +422,7 @@ static const struct pci_device_id artop_pci_tbl[] = { ...@@ -422,7 +422,7 @@ static const struct pci_device_id artop_pci_tbl[] = {
{ } /* terminate list */ { } /* terminate list */
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int atp8xx_reinit_one(struct pci_dev *pdev) static int atp8xx_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -444,7 +444,7 @@ static struct pci_driver artop_pci_driver = { ...@@ -444,7 +444,7 @@ static struct pci_driver artop_pci_driver = {
.id_table = artop_pci_tbl, .id_table = artop_pci_tbl,
.probe = artop_init_one, .probe = artop_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = atp8xx_reinit_one, .resume = atp8xx_reinit_one,
#endif #endif
......
drivers/ata/pata_atiixp.c
浏览文件 @ 58eb8cd5
...@@ -298,7 +298,7 @@ static struct pci_driver atiixp_pci_driver = { ...@@ -298,7 +298,7 @@ static struct pci_driver atiixp_pci_driver = {
.id_table = atiixp, .id_table = atiixp,
.probe = atiixp_init_one, .probe = atiixp_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
#endif #endif
......
drivers/ata/pata_atp867x.c
浏览文件 @ 58eb8cd5
...@@ -530,7 +530,7 @@ static int atp867x_init_one(struct pci_dev *pdev, ...@@ -530,7 +530,7 @@ static int atp867x_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int atp867x_reinit_one(struct pci_dev *pdev) static int atp867x_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -558,7 +558,7 @@ static struct pci_driver atp867x_driver = { ...@@ -558,7 +558,7 @@ static struct pci_driver atp867x_driver = {
.id_table = atp867x_pci_tbl, .id_table = atp867x_pci_tbl,
.probe = atp867x_init_one, .probe = atp867x_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = atp867x_reinit_one, .resume = atp867x_reinit_one,
#endif #endif
......
drivers/ata/pata_bf54x.c
浏览文件 @ 58eb8cd5
...@@ -1619,7 +1619,7 @@ static int bfin_atapi_remove(struct platform_device *pdev) ...@@ -1619,7 +1619,7 @@ static int bfin_atapi_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state) static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct ata_host *host = platform_get_drvdata(pdev); struct ata_host *host = platform_get_drvdata(pdev);
......
drivers/ata/pata_cmd640.c
浏览文件 @ 58eb8cd5
...@@ -231,7 +231,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -231,7 +231,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL, 0); return ata_pci_sff_init_one(pdev, ppi, &cmd640_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int cmd640_reinit_one(struct pci_dev *pdev) static int cmd640_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -256,7 +256,7 @@ static struct pci_driver cmd640_pci_driver = { ...@@ -256,7 +256,7 @@ static struct pci_driver cmd640_pci_driver = {
.id_table = cmd640, .id_table = cmd640,
.probe = cmd640_init_one, .probe = cmd640_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = cmd640_reinit_one, .resume = cmd640_reinit_one,
#endif #endif
......
drivers/ata/pata_cmd64x.c
浏览文件 @ 58eb8cd5
...@@ -487,7 +487,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -487,7 +487,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &cmd64x_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &cmd64x_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int cmd64x_reinit_one(struct pci_dev *pdev) static int cmd64x_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -518,7 +518,7 @@ static struct pci_driver cmd64x_pci_driver = { ...@@ -518,7 +518,7 @@ static struct pci_driver cmd64x_pci_driver = {
.id_table = cmd64x, .id_table = cmd64x,
.probe = cmd64x_init_one, .probe = cmd64x_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = cmd64x_reinit_one, .resume = cmd64x_reinit_one,
#endif #endif
......
drivers/ata/pata_cs5520.c
浏览文件 @ 58eb8cd5
...@@ -229,7 +229,7 @@ static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -229,7 +229,7 @@ static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_host_register(host, &cs5520_sht); return ata_host_register(host, &cs5520_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
/** /**
* cs5520_reinit_one - device resume * cs5520_reinit_one - device resume
* @pdev: PCI device * @pdev: PCI device
...@@ -278,7 +278,7 @@ static int cs5520_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) ...@@ -278,7 +278,7 @@ static int cs5520_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
pci_save_state(pdev); pci_save_state(pdev);
return 0; return 0;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP */
/* For now keep DMA off. We can set it for all but A rev CS5510 once the /* For now keep DMA off. We can set it for all but A rev CS5510 once the
core ATA code can handle it */ core ATA code can handle it */
...@@ -295,7 +295,7 @@ static struct pci_driver cs5520_pci_driver = { ...@@ -295,7 +295,7 @@ static struct pci_driver cs5520_pci_driver = {
.id_table = pata_cs5520, .id_table = pata_cs5520,
.probe = cs5520_init_one, .probe = cs5520_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = cs5520_pci_device_suspend, .suspend = cs5520_pci_device_suspend,
.resume = cs5520_reinit_one, .resume = cs5520_reinit_one,
#endif #endif
......
drivers/ata/pata_cs5530.c
浏览文件 @ 58eb8cd5
...@@ -326,7 +326,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -326,7 +326,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &cs5530_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &cs5530_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int cs5530_reinit_one(struct pci_dev *pdev) static int cs5530_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -343,7 +343,7 @@ static int cs5530_reinit_one(struct pci_dev *pdev) ...@@ -343,7 +343,7 @@ static int cs5530_reinit_one(struct pci_dev *pdev)
ata_host_resume(host); ata_host_resume(host);
return 0; return 0;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM_SLEEP */
static const struct pci_device_id cs5530[] = { static const struct pci_device_id cs5530[] = {
{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), }, { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), },
...@@ -356,7 +356,7 @@ static struct pci_driver cs5530_pci_driver = { ...@@ -356,7 +356,7 @@ static struct pci_driver cs5530_pci_driver = {
.id_table = cs5530, .id_table = cs5530,
.probe = cs5530_init_one, .probe = cs5530_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = cs5530_reinit_one, .resume = cs5530_reinit_one,
#endif #endif
......
drivers/ata/pata_cs5535.c
浏览文件 @ 58eb8cd5
...@@ -200,7 +200,7 @@ static struct pci_driver cs5535_pci_driver = { ...@@ -200,7 +200,7 @@ static struct pci_driver cs5535_pci_driver = {
.id_table = cs5535, .id_table = cs5535,
.probe = cs5535_init_one, .probe = cs5535_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_cs5536.c
浏览文件 @ 58eb8cd5
...@@ -297,7 +297,7 @@ static struct pci_driver cs5536_pci_driver = { ...@@ -297,7 +297,7 @@ static struct pci_driver cs5536_pci_driver = {
.id_table = cs5536, .id_table = cs5536,
.probe = cs5536_init_one, .probe = cs5536_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_cypress.c
浏览文件 @ 58eb8cd5
...@@ -151,7 +151,7 @@ static struct pci_driver cy82c693_pci_driver = { ...@@ -151,7 +151,7 @@ static struct pci_driver cy82c693_pci_driver = {
.id_table = cy82c693, .id_table = cy82c693,
.probe = cy82c693_init_one, .probe = cy82c693_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_efar.c
浏览文件 @ 58eb8cd5
...@@ -288,7 +288,7 @@ static struct pci_driver efar_pci_driver = { ...@@ -288,7 +288,7 @@ static struct pci_driver efar_pci_driver = {
.id_table = efar_pci_tbl, .id_table = efar_pci_tbl,
.probe = efar_init_one, .probe = efar_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_hpt366.c
浏览文件 @ 58eb8cd5
...@@ -386,7 +386,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -386,7 +386,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0); return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int hpt36x_reinit_one(struct pci_dev *dev) static int hpt36x_reinit_one(struct pci_dev *dev)
{ {
struct ata_host *host = pci_get_drvdata(dev); struct ata_host *host = pci_get_drvdata(dev);
...@@ -411,7 +411,7 @@ static struct pci_driver hpt36x_pci_driver = { ...@@ -411,7 +411,7 @@ static struct pci_driver hpt36x_pci_driver = {
.id_table = hpt36x, .id_table = hpt36x,
.probe = hpt36x_init_one, .probe = hpt36x_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = hpt36x_reinit_one, .resume = hpt36x_reinit_one,
#endif #endif
......
drivers/ata/pata_hpt3x3.c
浏览文件 @ 58eb8cd5
...@@ -249,7 +249,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -249,7 +249,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
IRQF_SHARED, &hpt3x3_sht); IRQF_SHARED, &hpt3x3_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int hpt3x3_reinit_one(struct pci_dev *dev) static int hpt3x3_reinit_one(struct pci_dev *dev)
{ {
struct ata_host *host = pci_get_drvdata(dev); struct ata_host *host = pci_get_drvdata(dev);
...@@ -277,7 +277,7 @@ static struct pci_driver hpt3x3_pci_driver = { ...@@ -277,7 +277,7 @@ static struct pci_driver hpt3x3_pci_driver = {
.id_table = hpt3x3, .id_table = hpt3x3,
.probe = hpt3x3_init_one, .probe = hpt3x3_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = hpt3x3_reinit_one, .resume = hpt3x3_reinit_one,
#endif #endif
......
drivers/ata/pata_imx.c
浏览文件 @ 58eb8cd5
...@@ -185,7 +185,7 @@ static int pata_imx_remove(struct platform_device *pdev) ...@@ -185,7 +185,7 @@ static int pata_imx_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pata_imx_suspend(struct device *dev) static int pata_imx_suspend(struct device *dev)
{ {
struct ata_host *host = dev_get_drvdata(dev); struct ata_host *host = dev_get_drvdata(dev);
...@@ -244,7 +244,7 @@ static struct platform_driver pata_imx_driver = { ...@@ -244,7 +244,7 @@ static struct platform_driver pata_imx_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = imx_pata_dt_ids, .of_match_table = imx_pata_dt_ids,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.pm = &pata_imx_pm_ops, .pm = &pata_imx_pm_ops,
#endif #endif
}, },
......
drivers/ata/pata_it8213.c
浏览文件 @ 58eb8cd5
...@@ -283,7 +283,7 @@ static struct pci_driver it8213_pci_driver = { ...@@ -283,7 +283,7 @@ static struct pci_driver it8213_pci_driver = {
.id_table = it8213_pci_tbl, .id_table = it8213_pci_tbl,
.probe = it8213_init_one, .probe = it8213_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_it821x.c
浏览文件 @ 58eb8cd5
...@@ -935,7 +935,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -935,7 +935,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &it821x_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &it821x_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int it821x_reinit_one(struct pci_dev *pdev) static int it821x_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -965,7 +965,7 @@ static struct pci_driver it821x_pci_driver = { ...@@ -965,7 +965,7 @@ static struct pci_driver it821x_pci_driver = {
.id_table = it821x, .id_table = it821x,
.probe = it821x_init_one, .probe = it821x_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = it821x_reinit_one, .resume = it821x_reinit_one,
#endif #endif
......
drivers/ata/pata_jmicron.c
浏览文件 @ 58eb8cd5
...@@ -157,7 +157,7 @@ static struct pci_driver jmicron_pci_driver = { ...@@ -157,7 +157,7 @@ static struct pci_driver jmicron_pci_driver = {
.id_table = jmicron_pci_tbl, .id_table = jmicron_pci_tbl,
.probe = jmicron_init_one, .probe = jmicron_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_macio.c
浏览文件 @ 58eb8cd5
...@@ -845,8 +845,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev) ...@@ -845,8 +845,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pata_macio_do_suspend(struct pata_macio_priv *priv, pm_message_t mesg) static int pata_macio_do_suspend(struct pata_macio_priv *priv, pm_message_t mesg)
{ {
int rc; int rc;
...@@ -907,8 +906,7 @@ static int pata_macio_do_resume(struct pata_macio_priv *priv) ...@@ -907,8 +906,7 @@ static int pata_macio_do_resume(struct pata_macio_priv *priv)
return 0; return 0;
} }
#endif /* CONFIG_PM_SLEEP */
#endif /* CONFIG_PM */
static struct scsi_host_template pata_macio_sht = { static struct scsi_host_template pata_macio_sht = {
ATA_BASE_SHT(DRV_NAME), ATA_BASE_SHT(DRV_NAME),
...@@ -1208,8 +1206,7 @@ static int pata_macio_detach(struct macio_dev *mdev) ...@@ -1208,8 +1206,7 @@ static int pata_macio_detach(struct macio_dev *mdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pata_macio_suspend(struct macio_dev *mdev, pm_message_t mesg) static int pata_macio_suspend(struct macio_dev *mdev, pm_message_t mesg)
{ {
struct ata_host *host = macio_get_drvdata(mdev); struct ata_host *host = macio_get_drvdata(mdev);
...@@ -1223,8 +1220,7 @@ static int pata_macio_resume(struct macio_dev *mdev) ...@@ -1223,8 +1220,7 @@ static int pata_macio_resume(struct macio_dev *mdev)
return pata_macio_do_resume(host->private_data); return pata_macio_do_resume(host->private_data);
} }
#endif /* CONFIG_PM_SLEEP */
#endif /* CONFIG_PM */
#ifdef CONFIG_PMAC_MEDIABAY #ifdef CONFIG_PMAC_MEDIABAY
static void pata_macio_mb_event(struct macio_dev* mdev, int mb_state) static void pata_macio_mb_event(struct macio_dev* mdev, int mb_state)
...@@ -1316,8 +1312,7 @@ static void pata_macio_pci_detach(struct pci_dev *pdev) ...@@ -1316,8 +1312,7 @@ static void pata_macio_pci_detach(struct pci_dev *pdev)
ata_host_detach(host); ata_host_detach(host);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pata_macio_pci_suspend(struct pci_dev *pdev, pm_message_t mesg) static int pata_macio_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -1331,8 +1326,7 @@ static int pata_macio_pci_resume(struct pci_dev *pdev) ...@@ -1331,8 +1326,7 @@ static int pata_macio_pci_resume(struct pci_dev *pdev)
return pata_macio_do_resume(host->private_data); return pata_macio_do_resume(host->private_data);
} }
#endif /* CONFIG_PM_SLEEP */
#endif /* CONFIG_PM */
static struct of_device_id pata_macio_match[] = static struct of_device_id pata_macio_match[] =
{ {
...@@ -1360,7 +1354,7 @@ static struct macio_driver pata_macio_driver = ...@@ -1360,7 +1354,7 @@ static struct macio_driver pata_macio_driver =
}, },
.probe = pata_macio_attach, .probe = pata_macio_attach,
.remove = pata_macio_detach, .remove = pata_macio_detach,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = pata_macio_suspend, .suspend = pata_macio_suspend,
.resume = pata_macio_resume, .resume = pata_macio_resume,
#endif #endif
...@@ -1383,7 +1377,7 @@ static struct pci_driver pata_macio_pci_driver = { ...@@ -1383,7 +1377,7 @@ static struct pci_driver pata_macio_pci_driver = {
.id_table = pata_macio_pci_match, .id_table = pata_macio_pci_match,
.probe = pata_macio_pci_attach, .probe = pata_macio_pci_attach,
.remove = pata_macio_pci_detach, .remove = pata_macio_pci_detach,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = pata_macio_pci_suspend, .suspend = pata_macio_pci_suspend,
.resume = pata_macio_pci_resume, .resume = pata_macio_pci_resume,
#endif #endif
......
drivers/ata/pata_marvell.c
浏览文件 @ 58eb8cd5
...@@ -171,7 +171,7 @@ static struct pci_driver marvell_pci_driver = { ...@@ -171,7 +171,7 @@ static struct pci_driver marvell_pci_driver = {
.id_table = marvell_pci_tbl, .id_table = marvell_pci_tbl,
.probe = marvell_init_one, .probe = marvell_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_mpc52xx.c
浏览文件 @ 58eb8cd5
...@@ -819,9 +819,7 @@ mpc52xx_ata_remove(struct platform_device *op) ...@@ -819,9 +819,7 @@ mpc52xx_ata_remove(struct platform_device *op)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
#ifdef CONFIG_PM
static int static int
mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state) mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
{ {
...@@ -847,10 +845,8 @@ mpc52xx_ata_resume(struct platform_device *op) ...@@ -847,10 +845,8 @@ mpc52xx_ata_resume(struct platform_device *op)
return 0; return 0;
} }
#endif #endif
static struct of_device_id mpc52xx_ata_of_match[] = { static struct of_device_id mpc52xx_ata_of_match[] = {
{ .compatible = "fsl,mpc5200-ata", }, { .compatible = "fsl,mpc5200-ata", },
{ .compatible = "mpc5200-ata", }, { .compatible = "mpc5200-ata", },
...@@ -861,7 +857,7 @@ static struct of_device_id mpc52xx_ata_of_match[] = { ...@@ -861,7 +857,7 @@ static struct of_device_id mpc52xx_ata_of_match[] = {
static struct platform_driver mpc52xx_ata_of_platform_driver = { static struct platform_driver mpc52xx_ata_of_platform_driver = {
.probe = mpc52xx_ata_probe, .probe = mpc52xx_ata_probe,
.remove = mpc52xx_ata_remove, .remove = mpc52xx_ata_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = mpc52xx_ata_suspend, .suspend = mpc52xx_ata_suspend,
.resume = mpc52xx_ata_resume, .resume = mpc52xx_ata_resume,
#endif #endif
......
drivers/ata/pata_mpiix.c
浏览文件 @ 58eb8cd5
...@@ -223,7 +223,7 @@ static struct pci_driver mpiix_pci_driver = { ...@@ -223,7 +223,7 @@ static struct pci_driver mpiix_pci_driver = {
.id_table = mpiix, .id_table = mpiix,
.probe = mpiix_init_one, .probe = mpiix_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_netcell.c
浏览文件 @ 58eb8cd5
...@@ -92,7 +92,7 @@ static struct pci_driver netcell_pci_driver = { ...@@ -92,7 +92,7 @@ static struct pci_driver netcell_pci_driver = {
.id_table = netcell_pci_tbl, .id_table = netcell_pci_tbl,
.probe = netcell_init_one, .probe = netcell_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_ninja32.c
浏览文件 @ 58eb8cd5
...@@ -152,8 +152,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -152,8 +152,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
IRQF_SHARED, &ninja32_sht); IRQF_SHARED, &ninja32_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int ninja32_reinit_one(struct pci_dev *pdev) static int ninja32_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -183,7 +182,7 @@ static struct pci_driver ninja32_pci_driver = { ...@@ -183,7 +182,7 @@ static struct pci_driver ninja32_pci_driver = {
.id_table = ninja32, .id_table = ninja32,
.probe = ninja32_init_one, .probe = ninja32_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ninja32_reinit_one, .resume = ninja32_reinit_one,
#endif #endif
......
drivers/ata/pata_ns87410.c
浏览文件 @ 58eb8cd5
...@@ -161,7 +161,7 @@ static struct pci_driver ns87410_pci_driver = { ...@@ -161,7 +161,7 @@ static struct pci_driver ns87410_pci_driver = {
.id_table = ns87410, .id_table = ns87410,
.probe = ns87410_init_one, .probe = ns87410_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_ns87415.c
浏览文件 @ 58eb8cd5
...@@ -385,7 +385,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = { ...@@ -385,7 +385,7 @@ static const struct pci_device_id ns87415_pci_tbl[] = {
{ } /* terminate list */ { } /* terminate list */
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int ns87415_reinit_one(struct pci_dev *pdev) static int ns87415_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -407,7 +407,7 @@ static struct pci_driver ns87415_pci_driver = { ...@@ -407,7 +407,7 @@ static struct pci_driver ns87415_pci_driver = {
.id_table = ns87415_pci_tbl, .id_table = ns87415_pci_tbl,
.probe = ns87415_init_one, .probe = ns87415_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ns87415_reinit_one, .resume = ns87415_reinit_one,
#endif #endif
......
drivers/ata/pata_oldpiix.c
浏览文件 @ 58eb8cd5
...@@ -258,7 +258,7 @@ static struct pci_driver oldpiix_pci_driver = { ...@@ -258,7 +258,7 @@ static struct pci_driver oldpiix_pci_driver = {
.id_table = oldpiix_pci_tbl, .id_table = oldpiix_pci_tbl,
.probe = oldpiix_init_one, .probe = oldpiix_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_opti.c
浏览文件 @ 58eb8cd5
...@@ -184,7 +184,7 @@ static struct pci_driver opti_pci_driver = { ...@@ -184,7 +184,7 @@ static struct pci_driver opti_pci_driver = {
.id_table = opti, .id_table = opti,
.probe = opti_init_one, .probe = opti_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_optidma.c
浏览文件 @ 58eb8cd5
...@@ -440,7 +440,7 @@ static struct pci_driver optidma_pci_driver = { ...@@ -440,7 +440,7 @@ static struct pci_driver optidma_pci_driver = {
.id_table = optidma, .id_table = optidma,
.probe = optidma_init_one, .probe = optidma_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_pdc2027x.c
浏览文件 @ 58eb8cd5
...@@ -62,7 +62,7 @@ enum { ...@@ -62,7 +62,7 @@ enum {
}; };
static int pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int pdc2027x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pdc2027x_reinit_one(struct pci_dev *pdev); static int pdc2027x_reinit_one(struct pci_dev *pdev);
#endif #endif
static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline); static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline);
...@@ -128,7 +128,7 @@ static struct pci_driver pdc2027x_pci_driver = { ...@@ -128,7 +128,7 @@ static struct pci_driver pdc2027x_pci_driver = {
.id_table = pdc2027x_pci_tbl, .id_table = pdc2027x_pci_tbl,
.probe = pdc2027x_init_one, .probe = pdc2027x_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = pdc2027x_reinit_one, .resume = pdc2027x_reinit_one,
#endif #endif
...@@ -761,7 +761,7 @@ static int pdc2027x_init_one(struct pci_dev *pdev, ...@@ -761,7 +761,7 @@ static int pdc2027x_init_one(struct pci_dev *pdev,
IRQF_SHARED, &pdc2027x_sht); IRQF_SHARED, &pdc2027x_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pdc2027x_reinit_one(struct pci_dev *pdev) static int pdc2027x_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
......
drivers/ata/pata_pdc202xx_old.c
浏览文件 @ 58eb8cd5
...@@ -377,7 +377,7 @@ static struct pci_driver pdc202xx_pci_driver = { ...@@ -377,7 +377,7 @@ static struct pci_driver pdc202xx_pci_driver = {
.id_table = pdc202xx, .id_table = pdc202xx,
.probe = pdc202xx_init_one, .probe = pdc202xx_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_piccolo.c
浏览文件 @ 58eb8cd5
...@@ -110,7 +110,7 @@ static struct pci_driver ata_tosh_pci_driver = { ...@@ -110,7 +110,7 @@ static struct pci_driver ata_tosh_pci_driver = {
.id_table = ata_tosh, .id_table = ata_tosh,
.probe = ata_tosh_init_one, .probe = ata_tosh_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_radisys.c
浏览文件 @ 58eb8cd5
...@@ -237,7 +237,7 @@ static struct pci_driver radisys_pci_driver = { ...@@ -237,7 +237,7 @@ static struct pci_driver radisys_pci_driver = {
.id_table = radisys_pci_tbl, .id_table = radisys_pci_tbl,
.probe = radisys_init_one, .probe = radisys_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_rdc.c
浏览文件 @ 58eb8cd5
...@@ -382,7 +382,7 @@ static struct pci_driver rdc_pci_driver = { ...@@ -382,7 +382,7 @@ static struct pci_driver rdc_pci_driver = {
.id_table = rdc_pci_tbl, .id_table = rdc_pci_tbl,
.probe = rdc_init_one, .probe = rdc_init_one,
.remove = rdc_remove_one, .remove = rdc_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_rz1000.c
浏览文件 @ 58eb8cd5
...@@ -101,7 +101,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en ...@@ -101,7 +101,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int rz1000_reinit_one(struct pci_dev *pdev) static int rz1000_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -133,7 +133,7 @@ static struct pci_driver rz1000_pci_driver = { ...@@ -133,7 +133,7 @@ static struct pci_driver rz1000_pci_driver = {
.id_table = pata_rz1000, .id_table = pata_rz1000,
.probe = rz1000_init_one, .probe = rz1000_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = rz1000_reinit_one, .resume = rz1000_reinit_one,
#endif #endif
......
drivers/ata/pata_samsung_cf.c
浏览文件 @ 58eb8cd5
...@@ -615,7 +615,7 @@ static int __exit pata_s3c_remove(struct platform_device *pdev) ...@@ -615,7 +615,7 @@ static int __exit pata_s3c_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int pata_s3c_suspend(struct device *dev) static int pata_s3c_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
...@@ -666,7 +666,7 @@ static struct platform_driver pata_s3c_driver = { ...@@ -666,7 +666,7 @@ static struct platform_driver pata_s3c_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.pm = &pata_s3c_pm_ops, .pm = &pata_s3c_pm_ops,
#endif #endif
}, },
......
drivers/ata/pata_sc1200.c
浏览文件 @ 58eb8cd5
...@@ -254,7 +254,7 @@ static struct pci_driver sc1200_pci_driver = { ...@@ -254,7 +254,7 @@ static struct pci_driver sc1200_pci_driver = {
.id_table = sc1200, .id_table = sc1200,
.probe = sc1200_init_one, .probe = sc1200_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_scc.c
浏览文件 @ 58eb8cd5
...@@ -1096,7 +1096,7 @@ static struct pci_driver scc_pci_driver = { ...@@ -1096,7 +1096,7 @@ static struct pci_driver scc_pci_driver = {
.id_table = scc_pci_tbl, .id_table = scc_pci_tbl,
.probe = scc_init_one, .probe = scc_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_sch.c
浏览文件 @ 58eb8cd5
...@@ -64,7 +64,7 @@ static struct pci_driver sch_pci_driver = { ...@@ -64,7 +64,7 @@ static struct pci_driver sch_pci_driver = {
.id_table = sch_pci_tbl, .id_table = sch_pci_tbl,
.probe = sch_init_one, .probe = sch_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_serverworks.c
浏览文件 @ 58eb8cd5
...@@ -436,7 +436,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id ...@@ -436,7 +436,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
return ata_pci_bmdma_init_one(pdev, ppi, &serverworks_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &serverworks_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int serverworks_reinit_one(struct pci_dev *pdev) static int serverworks_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -468,7 +468,7 @@ static struct pci_driver serverworks_pci_driver = { ...@@ -468,7 +468,7 @@ static struct pci_driver serverworks_pci_driver = {
.id_table = serverworks, .id_table = serverworks,
.probe = serverworks_init_one, .probe = serverworks_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = serverworks_reinit_one, .resume = serverworks_reinit_one,
#endif #endif
......
drivers/ata/pata_sil680.c
浏览文件 @ 58eb8cd5
...@@ -403,7 +403,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -403,7 +403,7 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &sil680_sht, NULL, 0); return ata_pci_bmdma_init_one(pdev, ppi, &sil680_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sil680_reinit_one(struct pci_dev *pdev) static int sil680_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -429,7 +429,7 @@ static struct pci_driver sil680_pci_driver = { ...@@ -429,7 +429,7 @@ static struct pci_driver sil680_pci_driver = {
.id_table = sil680, .id_table = sil680,
.probe = sil680_init_one, .probe = sil680_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = sil680_reinit_one, .resume = sil680_reinit_one,
#endif #endif
......
drivers/ata/pata_sis.c
浏览文件 @ 58eb8cd5
...@@ -869,7 +869,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -869,7 +869,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
return ata_pci_bmdma_init_one(pdev, ppi, &sis_sht, chipset, 0); return ata_pci_bmdma_init_one(pdev, ppi, &sis_sht, chipset, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sis_reinit_one(struct pci_dev *pdev) static int sis_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -899,7 +899,7 @@ static struct pci_driver sis_pci_driver = { ...@@ -899,7 +899,7 @@ static struct pci_driver sis_pci_driver = {
.id_table = sis_pci_tbl, .id_table = sis_pci_tbl,
.probe = sis_init_one, .probe = sis_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = sis_reinit_one, .resume = sis_reinit_one,
#endif #endif
......
drivers/ata/pata_sl82c105.c
浏览文件 @ 58eb8cd5
...@@ -337,7 +337,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id ...@@ -337,7 +337,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id
return ata_pci_bmdma_init_one(dev, ppi, &sl82c105_sht, NULL, 0); return ata_pci_bmdma_init_one(dev, ppi, &sl82c105_sht, NULL, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sl82c105_reinit_one(struct pci_dev *pdev) static int sl82c105_reinit_one(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -365,7 +365,7 @@ static struct pci_driver sl82c105_pci_driver = { ...@@ -365,7 +365,7 @@ static struct pci_driver sl82c105_pci_driver = {
.id_table = sl82c105, .id_table = sl82c105,
.probe = sl82c105_init_one, .probe = sl82c105_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = sl82c105_reinit_one, .resume = sl82c105_reinit_one,
#endif #endif
......
drivers/ata/pata_triflex.c
浏览文件 @ 58eb8cd5
...@@ -207,7 +207,7 @@ static const struct pci_device_id triflex[] = { ...@@ -207,7 +207,7 @@ static const struct pci_device_id triflex[] = {
{ }, { },
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) static int triflex_ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -233,7 +233,7 @@ static struct pci_driver triflex_pci_driver = { ...@@ -233,7 +233,7 @@ static struct pci_driver triflex_pci_driver = {
.id_table = triflex, .id_table = triflex,
.probe = triflex_init_one, .probe = triflex_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = triflex_ata_pci_device_suspend, .suspend = triflex_ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/pata_via.c
浏览文件 @ 58eb8cd5
...@@ -659,7 +659,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -659,7 +659,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0); return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
/** /**
* via_reinit_one - reinit after resume * via_reinit_one - reinit after resume
* @pdev; PCI device * @pdev; PCI device
...@@ -704,7 +704,7 @@ static struct pci_driver via_pci_driver = { ...@@ -704,7 +704,7 @@ static struct pci_driver via_pci_driver = {
.id_table = via, .id_table = via,
.probe = via_init_one, .probe = via_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = via_reinit_one, .resume = via_reinit_one,
#endif #endif
......
drivers/ata/sata_fsl.c
浏览文件 @ 58eb8cd5
...@@ -1588,7 +1588,7 @@ static int sata_fsl_remove(struct platform_device *ofdev) ...@@ -1588,7 +1588,7 @@ static int sata_fsl_remove(struct platform_device *ofdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sata_fsl_suspend(struct platform_device *op, pm_message_t state) static int sata_fsl_suspend(struct platform_device *op, pm_message_t state)
{ {
struct ata_host *host = platform_get_drvdata(op); struct ata_host *host = platform_get_drvdata(op);
...@@ -1644,7 +1644,7 @@ static struct platform_driver fsl_sata_driver = { ...@@ -1644,7 +1644,7 @@ static struct platform_driver fsl_sata_driver = {
}, },
.probe = sata_fsl_probe, .probe = sata_fsl_probe,
.remove = sata_fsl_remove, .remove = sata_fsl_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = sata_fsl_suspend, .suspend = sata_fsl_suspend,
.resume = sata_fsl_resume, .resume = sata_fsl_resume,
#endif #endif
......
drivers/ata/sata_inic162x.c
浏览文件 @ 58eb8cd5
...@@ -785,7 +785,7 @@ static int init_controller(void __iomem *mmio_base, u16 hctl) ...@@ -785,7 +785,7 @@ static int init_controller(void __iomem *mmio_base, u16 hctl)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int inic_pci_device_resume(struct pci_dev *pdev) static int inic_pci_device_resume(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -898,7 +898,7 @@ static const struct pci_device_id inic_pci_tbl[] = { ...@@ -898,7 +898,7 @@ static const struct pci_device_id inic_pci_tbl[] = {
static struct pci_driver inic_pci_driver = { static struct pci_driver inic_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = inic_pci_tbl, .id_table = inic_pci_tbl,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = inic_pci_device_resume, .resume = inic_pci_device_resume,
#endif #endif
......
drivers/ata/sata_mv.c
浏览文件 @ 58eb8cd5
...@@ -4222,7 +4222,7 @@ static int mv_platform_remove(struct platform_device *pdev) ...@@ -4222,7 +4222,7 @@ static int mv_platform_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state) static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct ata_host *host = platform_get_drvdata(pdev); struct ata_host *host = platform_get_drvdata(pdev);
...@@ -4289,7 +4289,7 @@ static struct platform_driver mv_platform_driver = { ...@@ -4289,7 +4289,7 @@ static struct platform_driver mv_platform_driver = {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int mv_pci_init_one(struct pci_dev *pdev, static int mv_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent); const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int mv_pci_device_resume(struct pci_dev *pdev); static int mv_pci_device_resume(struct pci_dev *pdev);
#endif #endif
...@@ -4299,7 +4299,7 @@ static struct pci_driver mv_pci_driver = { ...@@ -4299,7 +4299,7 @@ static struct pci_driver mv_pci_driver = {
.id_table = mv_pci_tbl, .id_table = mv_pci_tbl,
.probe = mv_pci_init_one, .probe = mv_pci_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = mv_pci_device_resume, .resume = mv_pci_device_resume,
#endif #endif
...@@ -4457,7 +4457,7 @@ static int mv_pci_init_one(struct pci_dev *pdev, ...@@ -4457,7 +4457,7 @@ static int mv_pci_init_one(struct pci_dev *pdev,
IS_GEN_I(hpriv) ? &mv5_sht : &mv6_sht); IS_GEN_I(hpriv) ? &mv5_sht : &mv6_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int mv_pci_device_resume(struct pci_dev *pdev) static int mv_pci_device_resume(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
......
drivers/ata/sata_nv.c
浏览文件 @ 58eb8cd5
...@@ -295,7 +295,7 @@ struct nv_swncq_port_priv { ...@@ -295,7 +295,7 @@ struct nv_swncq_port_priv {
#define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & (1 << (19 + (12 * (PORT))))) #define NV_ADMA_CHECK_INTR(GCTL, PORT) ((GCTL) & (1 << (19 + (12 * (PORT)))))
static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int nv_pci_device_resume(struct pci_dev *pdev); static int nv_pci_device_resume(struct pci_dev *pdev);
#endif #endif
static void nv_ck804_host_stop(struct ata_host *host); static void nv_ck804_host_stop(struct ata_host *host);
...@@ -379,7 +379,7 @@ static struct pci_driver nv_pci_driver = { ...@@ -379,7 +379,7 @@ static struct pci_driver nv_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = nv_pci_tbl, .id_table = nv_pci_tbl,
.probe = nv_init_one, .probe = nv_init_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = nv_pci_device_resume, .resume = nv_pci_device_resume,
#endif #endif
...@@ -2431,7 +2431,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2431,7 +2431,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht); return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int nv_pci_device_resume(struct pci_dev *pdev) static int nv_pci_device_resume(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
......
drivers/ata/sata_rcar.c
浏览文件 @ 58eb8cd5
...@@ -937,7 +937,7 @@ static int sata_rcar_remove(struct platform_device *pdev) ...@@ -937,7 +937,7 @@ static int sata_rcar_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sata_rcar_suspend(struct device *dev) static int sata_rcar_suspend(struct device *dev)
{ {
struct ata_host *host = dev_get_drvdata(dev); struct ata_host *host = dev_get_drvdata(dev);
...@@ -991,7 +991,7 @@ static struct platform_driver sata_rcar_driver = { ...@@ -991,7 +991,7 @@ static struct platform_driver sata_rcar_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = sata_rcar_match, .of_match_table = sata_rcar_match,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.pm = &sata_rcar_pm_ops, .pm = &sata_rcar_pm_ops,
#endif #endif
}, },
......
drivers/ata/sata_sil.c
浏览文件 @ 58eb8cd5
...@@ -112,7 +112,7 @@ enum { ...@@ -112,7 +112,7 @@ enum {
}; };
static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sil_pci_device_resume(struct pci_dev *pdev); static int sil_pci_device_resume(struct pci_dev *pdev);
#endif #endif
static void sil_dev_config(struct ata_device *dev); static void sil_dev_config(struct ata_device *dev);
...@@ -166,7 +166,7 @@ static struct pci_driver sil_pci_driver = { ...@@ -166,7 +166,7 @@ static struct pci_driver sil_pci_driver = {
.id_table = sil_pci_tbl, .id_table = sil_pci_tbl,
.probe = sil_init_one, .probe = sil_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = sil_pci_device_resume, .resume = sil_pci_device_resume,
#endif #endif
...@@ -802,7 +802,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -802,7 +802,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
&sil_sht); &sil_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sil_pci_device_resume(struct pci_dev *pdev) static int sil_pci_device_resume(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
......
drivers/ata/sata_sil24.c
浏览文件 @ 58eb8cd5
...@@ -353,8 +353,10 @@ static void sil24_error_handler(struct ata_port *ap); ...@@ -353,8 +353,10 @@ static void sil24_error_handler(struct ata_port *ap);
static void sil24_post_internal_cmd(struct ata_queued_cmd *qc); static void sil24_post_internal_cmd(struct ata_queued_cmd *qc);
static int sil24_port_start(struct ata_port *ap); static int sil24_port_start(struct ata_port *ap);
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sil24_pci_device_resume(struct pci_dev *pdev); static int sil24_pci_device_resume(struct pci_dev *pdev);
#endif
#ifdef CONFIG_PM
static int sil24_port_resume(struct ata_port *ap); static int sil24_port_resume(struct ata_port *ap);
#endif #endif
...@@ -375,7 +377,7 @@ static struct pci_driver sil24_pci_driver = { ...@@ -375,7 +377,7 @@ static struct pci_driver sil24_pci_driver = {
.id_table = sil24_pci_tbl, .id_table = sil24_pci_tbl,
.probe = sil24_init_one, .probe = sil24_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = sil24_pci_device_resume, .resume = sil24_pci_device_resume,
#endif #endif
...@@ -1350,7 +1352,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1350,7 +1352,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
&sil24_sht); &sil24_sht);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int sil24_pci_device_resume(struct pci_dev *pdev) static int sil24_pci_device_resume(struct pci_dev *pdev)
{ {
struct ata_host *host = pci_get_drvdata(pdev); struct ata_host *host = pci_get_drvdata(pdev);
...@@ -1370,7 +1372,9 @@ static int sil24_pci_device_resume(struct pci_dev *pdev) ...@@ -1370,7 +1372,9 @@ static int sil24_pci_device_resume(struct pci_dev *pdev)
return 0; return 0;
} }
#endif
#ifdef CONFIG_PM
static int sil24_port_resume(struct ata_port *ap) static int sil24_port_resume(struct ata_port *ap)
{ {
sil24_config_pmp(ap, ap->nr_pmp_links); sil24_config_pmp(ap, ap->nr_pmp_links);
......
drivers/ata/sata_sis.c
浏览文件 @ 58eb8cd5
...@@ -82,7 +82,7 @@ static struct pci_driver sis_pci_driver = { ...@@ -82,7 +82,7 @@ static struct pci_driver sis_pci_driver = {
.id_table = sis_pci_tbl, .id_table = sis_pci_tbl,
.probe = sis_init_one, .probe = sis_init_one,
.remove = ata_pci_remove_one, .remove = ata_pci_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
drivers/ata/sata_via.c
浏览文件 @ 58eb8cd5
...@@ -103,7 +103,7 @@ static struct pci_driver svia_pci_driver = { ...@@ -103,7 +103,7 @@ static struct pci_driver svia_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = svia_pci_tbl, .id_table = svia_pci_tbl,
.probe = svia_init_one, .probe = svia_init_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = ata_pci_device_suspend, .suspend = ata_pci_device_suspend,
.resume = ata_pci_device_resume, .resume = ata_pci_device_resume,
#endif #endif
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或