Commit 8d189f72 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

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

This fixes u32 vs. pm_message_t in drivers/message.
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a2910689
...@@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev) ...@@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev)
* *
*/ */
static int static int
mptbase_suspend(struct pci_dev *pdev, u32 state) mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
u32 device_state; u32 device_state;
MPT_ADAPTER *ioc = pci_get_drvdata(pdev); MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
......
...@@ -215,7 +215,7 @@ struct mpt_pci_driver{ ...@@ -215,7 +215,7 @@ struct mpt_pci_driver{
void (*shutdown) (struct device * dev); void (*shutdown) (struct device * dev);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int (*resume) (struct pci_dev *dev); int (*resume) (struct pci_dev *dev);
int (*suspend) (struct pci_dev *dev, u32 state); int (*suspend) (struct pci_dev *dev, pm_message_t state);
#endif #endif
}; };
......
...@@ -220,7 +220,7 @@ static int mptscsih_probe (struct pci_dev *, const struct pci_device_id *); ...@@ -220,7 +220,7 @@ static int mptscsih_probe (struct pci_dev *, const struct pci_device_id *);
static void mptscsih_remove(struct pci_dev *); static void mptscsih_remove(struct pci_dev *);
static void mptscsih_shutdown(struct device *); static void mptscsih_shutdown(struct device *);
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int mptscsih_suspend(struct pci_dev *pdev, u32 state); static int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
static int mptscsih_resume(struct pci_dev *pdev); static int mptscsih_resume(struct pci_dev *pdev);
#endif #endif
...@@ -1389,7 +1389,7 @@ mptscsih_shutdown(struct device * dev) ...@@ -1389,7 +1389,7 @@ mptscsih_shutdown(struct device * dev)
* *
*/ */
static int static int
mptscsih_suspend(struct pci_dev *pdev, u32 state) mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
mptscsih_shutdown(&pdev->dev); mptscsih_shutdown(&pdev->dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment