diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:28 -0700 |
| commit | 8d189f729829369edb2e797e9a6ebc2b01b359d0 (patch) | |
| tree | a2c723d4c8b0e18ee5249c85a125906aef1d5bdd /drivers/message | |
| parent | a291068991c4d0cc4c2bd533094422bf417c86dd (diff) | |
| download | kernel_samsung_tuna-8d189f729829369edb2e797e9a6ebc2b01b359d0.zip kernel_samsung_tuna-8d189f729829369edb2e797e9a6ebc2b01b359d0.tar.gz kernel_samsung_tuna-8d189f729829369edb2e797e9a6ebc2b01b359d0.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 2 | ||||
| -rw-r--r-- | drivers/message/fusion/mptbase.h | 2 | ||||
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 942cc1c..8b22630 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev) * */ static int -mptbase_suspend(struct pci_dev *pdev, u32 state) +mptbase_suspend(struct pci_dev *pdev, pm_message_t state) { u32 device_state; MPT_ADAPTER *ioc = pci_get_drvdata(pdev); diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index be67307..6d16acc 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h @@ -215,7 +215,7 @@ struct mpt_pci_driver{ void (*shutdown) (struct device * dev); #ifdef CONFIG_PM 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 }; diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index c98d625..3a3ef12 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c @@ -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_shutdown(struct device *); #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); #endif @@ -1389,7 +1389,7 @@ mptscsih_shutdown(struct device * dev) * */ static int -mptscsih_suspend(struct pci_dev *pdev, u32 state) +mptscsih_suspend(struct pci_dev *pdev, pm_message_t state) { mptscsih_shutdown(&pdev->dev); return 0; |