From: Pavel Machek Date: Sat, 16 Apr 2005 22:25:28 +0000 (-0700) Subject: [PATCH] fix u32 vs. pm_message_t in drivers/message X-Git-Tag: MMI-PSA29.97-13-9~57686 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d189f729829369edb2e797e9a6ebc2b01b359d0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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) * */ 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 be673070bc34..6d16acc7a179 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 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 *); 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;