tree a2c723d4c8b0e18ee5249c85a125906aef1d5bdd
parent a291068991c4d0cc4c2bd533094422bf417c86dd
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:28 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:28 -0700
[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]>
message/fusion/mptbase.c | 2 +-
message/fusion/mptbase.h | 2 +-
message/fusion/mptscsih.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: drivers/message/fusion/mptbase.c
===================================================================
--- df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/message/fusion/mptbase.c
(mode:100644 sha1:942cc1c2a186cf51a232c59ca46cd60ba93b2e37)
+++ a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/message/fusion/mptbase.c
(mode:100644 sha1:8b22630f1aef18c8b400b6a2cebf42b736e0b583)
@@ -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
===================================================================
--- df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/message/fusion/mptbase.h
(mode:100644 sha1:be673070bc34e122b09b215cfd97b505fc182502)
+++ a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/message/fusion/mptbase.h
(mode:100644 sha1:6d16acc7a179e6e1f8ba83a44cd696a53e0497f8)
@@ -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
===================================================================
--- df3494c807602bdaa5e83cd04bf61c24bcfa516d/drivers/message/fusion/mptscsih.c
(mode:100644 sha1:c98d6257ec02f7e2e1b7ff9eb1a340017e278096)
+++ a2c723d4c8b0e18ee5249c85a125906aef1d5bdd/drivers/message/fusion/mptscsih.c
(mode:100644 sha1:3a3ef127df040c6ac6f7cb593223e515d1a2fa3c)
@@ -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
