diff options
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 14 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 8b623278ccd2..ffbe6f4720e1 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -1363,19 +1363,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1363 | u32 device_state; | 1363 | u32 device_state; |
1364 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); | 1364 | MPT_ADAPTER *ioc = pci_get_drvdata(pdev); |
1365 | 1365 | ||
1366 | switch(state) | 1366 | device_state=pci_choose_state(pdev, state); |
1367 | { | ||
1368 | case 1: /* S1 */ | ||
1369 | device_state=1; /* D1 */; | ||
1370 | break; | ||
1371 | case 3: /* S3 */ | ||
1372 | case 4: /* S4 */ | ||
1373 | device_state=3; /* D3 */; | ||
1374 | break; | ||
1375 | default: | ||
1376 | return -EAGAIN /*FIXME*/; | ||
1377 | break; | ||
1378 | } | ||
1379 | 1367 | ||
1380 | printk(MYIOC_s_INFO_FMT | 1368 | printk(MYIOC_s_INFO_FMT |
1381 | "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n", | 1369 | "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n", |
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index 5ea89bf0df19..debb8ac59545 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h | |||
@@ -84,7 +84,7 @@ | |||
84 | extern void mptscsih_remove(struct pci_dev *); | 84 | extern void mptscsih_remove(struct pci_dev *); |
85 | extern void mptscsih_shutdown(struct pci_dev *); | 85 | extern void mptscsih_shutdown(struct pci_dev *); |
86 | #ifdef CONFIG_PM | 86 | #ifdef CONFIG_PM |
87 | extern int mptscsih_suspend(struct pci_dev *pdev, u32 state); | 87 | extern int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state); |
88 | extern int mptscsih_resume(struct pci_dev *pdev); | 88 | extern int mptscsih_resume(struct pci_dev *pdev); |
89 | #endif | 89 | #endif |
90 | extern int mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int func); | 90 | extern int mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int func); |