tree 99c00314f21a6bf189797474c995b4171e0df7bd
parent 300e90e1745336d0b4fac40744f4a099eb6e808a
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:57 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:57 2005
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
mptbase.c | 2 +-
mptbase.h | 2 +-
mptscsih.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: drivers/message/fusion/mptbase.c
===================================================================
--- b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/message/fusion/mptbase.c
(mode:100644 sha1:f8ea0e5419af03f913ab12ff17dbfc66bd567a13)
+++ 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/message/fusion/mptbase.c
(mode:100644 sha1:7d0a5ef4a075ac39ac7f28978826e117d3e907b7)
@@ -1429,7 +1429,7 @@
*
*/
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);
Index: drivers/message/fusion/mptbase.h
===================================================================
--- b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/message/fusion/mptbase.h
(mode:100644 sha1:1b7feb7b4af3d1f657c26dcf1db2a0d633b007e5)
+++ 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/message/fusion/mptbase.h
(mode:100644 sha1:b96bb5bfbbf26ad3a939d73706a0255359c9d352)
@@ -215,7 +215,7 @@
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
};
Index: drivers/message/fusion/mptscsih.c
===================================================================
--- b533102f6d48fcc18e29df89cb0cb514992c541c/drivers/message/fusion/mptscsih.c
(mode:100644 sha1:18c9a1475c1099441ba4cacc5a38a206bb49e0d2)
+++ 99c00314f21a6bf189797474c995b4171e0df7bd/drivers/message/fusion/mptscsih.c
(mode:100644 sha1:831b93385c6041bb913c069654a7a52c72fe04f8)
@@ -220,7 +220,7 @@
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 @@
*
*/
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;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
