From: Pavel Machek <pavel@ucw.cz>
To: Andrew Morton <akpm@zip.com.au>,
kernel list <linux-kernel@vger.kernel.org>
Subject: [patch 04/04] fix pm_message_t stuff in -mm tree
Date: Thu, 14 Jul 2005 02:45:53 +0200 [thread overview]
Message-ID: <20050714004553.GD7836@elf.ucw.cz> (raw)
This should bits from -mm tree that are affected by pm_message_t
conversion. [I'm not 100% sure I got all of them, but I certainly got
all the errors on make allyesconfig build, and most of warnings,
too. I'll go through the buildlog tommorow and fix any remaining
bits].
--- clean-mm/drivers/net/wireless/hostap/hostap_pci.c 2005-07-14 01:17:53.000000000 +0200
+++ linux-mm/drivers/net/wireless/hostap/hostap_pci.c 2005-07-14 02:11:57.000000000 +0200
@@ -385,7 +385,7 @@
#ifdef CONFIG_PM
-static int prism2_pci_suspend(struct pci_dev *pdev, u32 state)
+static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -396,7 +396,7 @@
prism2_suspend(dev);
pci_save_state(pdev);
pci_disable_device(pdev);
- pci_set_power_state(pdev, 3);
+ pci_set_power_state(pdev, PCI_D3hot);
return 0;
}
--- clean-mm/drivers/net/wireless/ipw2200.c 2005-07-14 01:17:53.000000000 +0200
+++ linux-mm/drivers/net/wireless/ipw2200.c 2005-07-14 02:11:14.000000000 +0200
@@ -7229,7 +7229,7 @@
#ifdef CONFIG_PM
-static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
+static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct ipw_priv *priv = pci_get_drvdata(pdev);
struct net_device *dev = priv->net_dev;
@@ -7248,7 +7248,7 @@
pci_save_state(pdev);
#endif
pci_disable_device(pdev);
- pci_set_power_state(pdev, state);
+ pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0;
}
--- clean-mm/drivers/perfctr/x86.c 2005-07-14 01:17:53.000000000 +0200
+++ linux-mm/drivers/perfctr/x86.c 2005-07-14 02:17:39.000000000 +0200
@@ -1640,7 +1640,7 @@
#include <linux/sysdev.h>
-static int perfctr_device_suspend(struct sys_device *dev, u32 state)
+static int perfctr_device_suspend(struct sys_device *dev, pm_message_t state)
{
perfctr_pm_suspend();
return 0;
--
teflon -- maybe it is a trademark, but it should not be.
reply other threads:[~2005-07-14 0:49 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=20050714004553.GD7836@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.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®