projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
[deliverable/linux.git]
/
drivers
/
ide
/
ppc
/
pmac.c
diff --git
a/drivers/ide/ppc/pmac.c
b/drivers/ide/ppc/pmac.c
index ea65b070a3675b2e3c3f2b6e1e1840f93adb6cb8..d2760b8ca1590c3e0294ac2a274fa88c41545d3c 100644
(file)
--- 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)
}
static int
}
static int
-pmac_ide_macio_suspend(struct macio_dev *mdev,
u32
state)
+pmac_ide_macio_suspend(struct macio_dev *mdev,
pm_message_t
state)
{
ide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
int rc = 0;
{
ide_hwif_t *hwif = (ide_hwif_t *)dev_get_drvdata(&mdev->ofdev.dev);
int rc = 0;
@@
-1527,7
+1527,7
@@
pmac_ide_macio_resume(struct macio_dev *mdev)
if (mdev->ofdev.dev.power.power_state != 0) {
rc = pmac_ide_do_resume(hwif);
if (rc == 0)
if (mdev->ofdev.dev.power.power_state != 0) {
rc = pmac_ide_do_resume(hwif);
if (rc == 0)
- mdev->ofdev.dev.power.power_state =
0
;
+ mdev->ofdev.dev.power.power_state =
PMSG_ON
;
}
return rc;
}
return rc;
@@
-1608,7
+1608,7
@@
pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
}
static int
}
static int
-pmac_ide_pci_suspend(struct pci_dev *pdev,
u32
state)
+pmac_ide_pci_suspend(struct pci_dev *pdev,
pm_message_t
state)
{
ide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
int rc = 0;
{
ide_hwif_t *hwif = (ide_hwif_t *)pci_get_drvdata(pdev);
int rc = 0;
@@
-1631,7
+1631,7
@@
pmac_ide_pci_resume(struct pci_dev *pdev)
if (pdev->dev.power.power_state != 0) {
rc = pmac_ide_do_resume(hwif);
if (rc == 0)
if (pdev->dev.power.power_state != 0) {
rc = pmac_ide_do_resume(hwif);
if (rc == 0)
- pdev->dev.power.power_state =
0
;
+ pdev->dev.power.power_state =
PMSG_ON
;
}
return rc;
}
return rc;
This page took
0.043279 seconds
and
5
git commands to generate.