lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pm: more u32 vs. pm_message_t fixes

Browse Source 
Few more u32 vs. pm_message_t fixes.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek
2005-07-07 17:56:40 -07:00
committed by Linus Torvalds
parent e8af300c3b
commit 2a569579be
7 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/message/fusion/mptbase.c
View File

@@ -1363,19 +1363,7 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
u32 device_state;
MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
switch(state)
{
case 1: /* S1 */
device_state=1; /* D1 */;
break;
case 3: /* S3 */
case 4: /* S4 */
device_state=3; /* D3 */;
break;
default:
return -EAGAIN /*FIXME*/;
break;
}
device_state=pci_choose_state(pdev, state);
printk(MYIOC_s_INFO_FMT
"pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n",

2
drivers/message/fusion/mptscsih.h
View File

@@ -84,7 +84,7 @@
extern void mptscsih_remove(struct pci_dev *);
extern void mptscsih_shutdown(struct pci_dev *);
#ifdef CONFIG_PM
extern int mptscsih_suspend(struct pci_dev *pdev, u32 state);
extern int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
extern int mptscsih_resume(struct pci_dev *pdev);
#endif
extern int mptscsih_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int func);