diff options
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index ea65b070a367..d2760b8ca159 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1504,7 +1504,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
1504 | } | 1504 | } |
1505 | 1505 | ||
1506 | static int | 1506 | static int |
1507 | pmac_ide_macio_suspend(struct macio_dev *mdev, u32 state) | 1507 | pmac_ide_macio_suspend(struct macio_dev *mdev, pm_message_t state) |
1508 | { | 1508 | { |
1509 | ide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); | 1509 | ide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev); |
1510 | int rc = 0; | 1510 | int rc = 0; |
@@ -1527,7 +1527,7 @@ pmac_ide_macio_resume(struct macio_dev *mdev) | |||
1527 | if (mdev->ofdev.dev.power.power_state != 0) { | 1527 | if (mdev->ofdev.dev.power.power_state != 0) { |
1528 | rc = pmac_ide_do_resume(hwif); | 1528 | rc = pmac_ide_do_resume(hwif); |
1529 | if (rc == 0) | 1529 | if (rc == 0) |
1530 | mdev->ofdev.dev.power.power_state = 0; | 1530 | mdev->ofdev.dev.power.power_state = PMSG_ON; |
1531 | } | 1531 | } |
1532 | 1532 | ||
1533 | return rc; | 1533 | return rc; |
@@ -1608,7 +1608,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1608 | } | 1608 | } |
1609 | 1609 | ||
1610 | static int | 1610 | static int |
1611 | pmac_ide_pci_suspend(struct pci_dev *pdev, u32 state) | 1611 | pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t state) |
1612 | { | 1612 | { |
1613 | ide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata(pdev); | 1613 | ide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata(pdev); |
1614 | int rc = 0; | 1614 | int rc = 0; |
@@ -1631,7 +1631,7 @@ pmac_ide_pci_resume(struct pci_dev *pdev) | |||
1631 | if (pdev->dev.power.power_state != 0) { | 1631 | if (pdev->dev.power.power_state != 0) { |
1632 | rc = pmac_ide_do_resume(hwif); | 1632 | rc = pmac_ide_do_resume(hwif); |
1633 | if (rc == 0) | 1633 | if (rc == 0) |
1634 | pdev->dev.power.power_state = 0; | 1634 | pdev->dev.power.power_state = PMSG_ON; |
1635 | } | 1635 | } |
1636 | 1636 | ||
1637 | return rc; | 1637 | return rc; |