diff options
| author | Pavel Machek | 2005-04-16 15:25:29 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-16 15:25:29 -0700 |
| commit | e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc (patch) | |
| tree | 27dd779f05409b4f7ee91569ad009224729ccbb2 /drivers/scsi | |
| parent | 8d189f729829369edb2e797e9a6ebc2b01b359d0 (diff) | |
[PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi
This fixes u32 vs. pm_message_t in drivers/mmc, drivers/mtd and
drivers/scsi.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/mesh.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/nsp32.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 85f3a74ac421..f6da46d672f1 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c @@ -1757,7 +1757,7 @@ static void set_mesh_power(struct mesh_state *ms, int state) #ifdef CONFIG_PM -static int mesh_suspend(struct macio_dev *mdev, u32 state) +static int mesh_suspend(struct macio_dev *mdev, pm_message_t state) { struct mesh_state *ms = (struct mesh_state *)macio_get_drvdata(mdev); unsigned long flags; diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index acfead1e9f17..d28c0d99c344 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c @@ -3435,7 +3435,7 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data) #ifdef CONFIG_PM /* Device suspended */ -static int nsp32_suspend(struct pci_dev *pdev, u32 state) +static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state) { struct Scsi_Host *host = pci_get_drvdata(pdev); @@ -3443,7 +3443,7 @@ static int nsp32_suspend(struct pci_dev *pdev, u32 state) pci_save_state (pdev); pci_disable_device (pdev); - pci_set_power_state(pdev, state); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; } @@ -3457,8 +3457,8 @@ static int nsp32_resume(struct pci_dev *pdev) nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); - pci_set_power_state(pdev, 0); - pci_enable_wake (pdev, 0, 0); + pci_set_power_state(pdev, PCI_D0); + pci_enable_wake (pdev, PCI_D0, 0); pci_restore_state (pdev); reg = nsp32_read2(data->BaseAddress, INDEX_REG); @@ -3479,7 +3479,7 @@ static int nsp32_resume(struct pci_dev *pdev) } /* Enable wake event */ -static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable) +static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable) { struct Scsi_Host *host = pci_get_drvdata(pdev); |