diff options
Diffstat (limited to 'drivers/scsi/nsp32.c')
-rw-r--r-- | drivers/scsi/nsp32.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
3435 | #ifdef CONFIG_PM | 3435 | #ifdef CONFIG_PM |
3436 | 3436 | ||
3437 | /* Device suspended */ | 3437 | /* Device suspended */ |
3438 | static int nsp32_suspend(struct pci_dev *pdev, u32 state) | 3438 | static int nsp32_suspend(struct pci_dev *pdev, pm_message_t state) |
3439 | { | 3439 | { |
3440 | struct Scsi_Host *host = pci_get_drvdata(pdev); | 3440 | struct Scsi_Host *host = pci_get_drvdata(pdev); |
3441 | 3441 | ||
@@ -3443,7 +3443,7 @@ static int nsp32_suspend(struct pci_dev *pdev, u32 state) | |||
3443 | 3443 | ||
3444 | pci_save_state (pdev); | 3444 | pci_save_state (pdev); |
3445 | pci_disable_device (pdev); | 3445 | pci_disable_device (pdev); |
3446 | pci_set_power_state(pdev, state); | 3446 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
3447 | 3447 | ||
3448 | return 0; | 3448 | return 0; |
3449 | } | 3449 | } |
@@ -3457,8 +3457,8 @@ static int nsp32_resume(struct pci_dev *pdev) | |||
3457 | 3457 | ||
3458 | nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); | 3458 | nsp32_msg(KERN_INFO, "pci-resume: pdev=0x%p, slot=%s, host=0x%p", pdev, pci_name(pdev), host); |
3459 | 3459 | ||
3460 | pci_set_power_state(pdev, 0); | 3460 | pci_set_power_state(pdev, PCI_D0); |
3461 | pci_enable_wake (pdev, 0, 0); | 3461 | pci_enable_wake (pdev, PCI_D0, 0); |
3462 | pci_restore_state (pdev); | 3462 | pci_restore_state (pdev); |
3463 | 3463 | ||
3464 | reg = nsp32_read2(data->BaseAddress, INDEX_REG); | 3464 | reg = nsp32_read2(data->BaseAddress, INDEX_REG); |
@@ -3479,7 +3479,7 @@ static int nsp32_resume(struct pci_dev *pdev) | |||
3479 | } | 3479 | } |
3480 | 3480 | ||
3481 | /* Enable wake event */ | 3481 | /* Enable wake event */ |
3482 | static int nsp32_enable_wake(struct pci_dev *pdev, u32 state, int enable) | 3482 | static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable) |
3483 | { | 3483 | { |
3484 | struct Scsi_Host *host = pci_get_drvdata(pdev); | 3484 | struct Scsi_Host *host = pci_get_drvdata(pdev); |
3485 | 3485 | ||