aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:28 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:28 -0400
commit8d189f729829369edb2e797e9a6ebc2b01b359d0 (patch)
treea2c723d4c8b0e18ee5249c85a125906aef1d5bdd /drivers
parenta291068991c4d0cc4c2bd533094422bf417c86dd (diff)
[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')
-rw-r--r--drivers/message/fusion/mptbase.c2
-rw-r--r--drivers/message/fusion/mptbase.h2
-rw-r--r--drivers/message/fusion/mptscsih.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 942cc1c2a186..8b22630f1aef 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev)
1429 * 1429 *
1430 */ 1430 */
1431static int 1431static int
1432mptbase_suspend(struct pci_dev *pdev, u32 state) 1432mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
1433{ 1433{
1434 u32 device_state; 1434 u32 device_state;
1435 MPT_ADAPTER *ioc = pci_get_drvdata(pdev); 1435 MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index be673070bc34..6d16acc7a179 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -215,7 +215,7 @@ struct mpt_pci_driver{
215 void (*shutdown) (struct device * dev); 215 void (*shutdown) (struct device * dev);
216#ifdef CONFIG_PM 216#ifdef CONFIG_PM
217 int (*resume) (struct pci_dev *dev); 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#endif 219#endif
220}; 220};
221 221
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index c98d6257ec02..3a3ef127df04 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 *);
220static void mptscsih_remove(struct pci_dev *); 220static void mptscsih_remove(struct pci_dev *);
221static void mptscsih_shutdown(struct device *); 221static void mptscsih_shutdown(struct device *);
222#ifdef CONFIG_PM 222#ifdef CONFIG_PM
223static int mptscsih_suspend(struct pci_dev *pdev, u32 state); 223static int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
224static int mptscsih_resume(struct pci_dev *pdev); 224static int mptscsih_resume(struct pci_dev *pdev);
225#endif 225#endif
226 226
@@ -1389,7 +1389,7 @@ mptscsih_shutdown(struct device * dev)
1389 * 1389 *
1390 */ 1390 */
1391static int 1391static int
1392mptscsih_suspend(struct pci_dev *pdev, u32 state) 1392mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
1393{ 1393{
1394 mptscsih_shutdown(&pdev->dev); 1394 mptscsih_shutdown(&pdev->dev);
1395 return 0; 1395 return 0;