From: akpm@osdl.org
To: torvalds@osdl.org
Cc: linux-kernel@vger.kernel.org, akpm@osdl.org, pavel@ucw.cz, pavel@suse.cz
Subject: [patch 110/198] fix u32 vs. pm_message_t in drivers/message
Date: Tue, 12 Apr 2005 03:32:17 -0700 [thread overview]
Message-ID: <200504121032.j3CAWNuQ005577@shell0.pdx.osdl.net> (raw)
From: Pavel Machek <pavel@ucw.cz>
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>
---
25-akpm/drivers/message/fusion/mptbase.c | 2 +-
25-akpm/drivers/message/fusion/mptbase.h | 2 +-
25-akpm/drivers/message/fusion/mptscsih.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/message/fusion/mptbase.c~fix-u32-vs-pm_message_t-in-drivers-message drivers/message/fusion/mptbase.c
--- 25/drivers/message/fusion/mptbase.c~fix-u32-vs-pm_message_t-in-drivers-message 2005-04-12 03:21:29.942584936 -0700
+++ 25-akpm/drivers/message/fusion/mptbase.c 2005-04-12 03:21:29.952583416 -0700
@@ -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 -puN drivers/message/fusion/mptbase.h~fix-u32-vs-pm_message_t-in-drivers-message drivers/message/fusion/mptbase.h
--- 25/drivers/message/fusion/mptbase.h~fix-u32-vs-pm_message_t-in-drivers-message 2005-04-12 03:21:29.943584784 -0700
+++ 25-akpm/drivers/message/fusion/mptbase.h 2005-04-12 03:21:29.954583112 -0700
@@ -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 -puN drivers/message/fusion/mptscsih.c~fix-u32-vs-pm_message_t-in-drivers-message drivers/message/fusion/mptscsih.c
--- 25/drivers/message/fusion/mptscsih.c~fix-u32-vs-pm_message_t-in-drivers-message 2005-04-12 03:21:29.945584480 -0700
+++ 25-akpm/drivers/message/fusion/mptscsih.c 2005-04-12 03:21:29.958582504 -0700
@@ -220,7 +220,7 @@ static int mptscsih_probe (struct pci_d
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;
_
reply other threads:[~2005-04-12 19:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200504121032.j3CAWNuQ005577@shell0.pdx.osdl.net \
--to=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@suse.cz \
--cc=pavel@ucw.cz \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®