Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] fix u32 vs. pm_message_t in drivers/message

This fixes u32 vs. pm_message_t in drivers/message.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Pavel Machek and committed by
Linus Torvalds
8d189f72 a2910689

+4 -4
+1 -1
drivers/message/fusion/mptbase.c
··· 1429 1429 * 1430 1430 */ 1431 1431 static int 1432 - mptbase_suspend(struct pci_dev *pdev, u32 state) 1432 + mptbase_suspend(struct pci_dev *pdev, pm_message_t state) 1433 1433 { 1434 1434 u32 device_state; 1435 1435 MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
+1 -1
drivers/message/fusion/mptbase.h
··· 215 215 void (*shutdown) (struct device * dev); 216 216 #ifdef CONFIG_PM 217 217 int (*resume) (struct pci_dev *dev); 218 - int (*suspend) (struct pci_dev *dev, u32 state); 218 + int (*suspend) (struct pci_dev *dev, pm_message_t state); 219 219 #endif 220 220 }; 221 221
+2 -2
drivers/message/fusion/mptscsih.c
··· 220 220 static void mptscsih_remove(struct pci_dev *); 221 221 static void mptscsih_shutdown(struct device *); 222 222 #ifdef CONFIG_PM 223 - static int mptscsih_suspend(struct pci_dev *pdev, u32 state); 223 + static int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state); 224 224 static int mptscsih_resume(struct pci_dev *pdev); 225 225 #endif 226 226 ··· 1389 1389 * 1390 1390 */ 1391 1391 static int 1392 - mptscsih_suspend(struct pci_dev *pdev, u32 state) 1392 + mptscsih_suspend(struct pci_dev *pdev, pm_message_t state) 1393 1393 { 1394 1394 mptscsih_shutdown(&pdev->dev); 1395 1395 return 0;