aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-09-03 18:56:58 -0400
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 03:06:16 -0400
commit583a4e88db1eadc52116e1f97b4519de655b2b80 (patch)
treed86d570bd4c20227efe4d19429a1955580c040ad
parentca078bae813dd46c0f9b102fdfb4a3384641ff48 (diff)
[PATCH] fix pm_message_t stuff in -mm tree
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]. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/wireless/hostap/hostap_pci.c2
-rw-r--r--drivers/net/wireless/ipw2200.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 4f567ef6178d..025f8cdb5566 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -416,7 +416,7 @@ static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
416 prism2_suspend(dev); 416 prism2_suspend(dev);
417 pci_save_state(pdev); 417 pci_save_state(pdev);
418 pci_disable_device(pdev); 418 pci_disable_device(pdev);
419 pci_set_power_state(pdev, 3); 419 pci_set_power_state(pdev, PCI_D3hot);
420 420
421 return 0; 421 return 0;
422} 422}
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 6d0b6b1df4ca..2a3bd607a5cd 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7225,7 +7225,7 @@ static void ipw_pci_remove(struct pci_dev *pdev)
7225 7225
7226 7226
7227#ifdef CONFIG_PM 7227#ifdef CONFIG_PM
7228static int ipw_pci_suspend(struct pci_dev *pdev, u32 state) 7228static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
7229{ 7229{
7230 struct ipw_priv *priv = pci_get_drvdata(pdev); 7230 struct ipw_priv *priv = pci_get_drvdata(pdev);
7231 struct net_device *dev = priv->net_dev; 7231 struct net_device *dev = priv->net_dev;
@@ -7240,7 +7240,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
7240 7240
7241 pci_save_state(pdev); 7241 pci_save_state(pdev);
7242 pci_disable_device(pdev); 7242 pci_disable_device(pdev);
7243 pci_set_power_state(pdev, state); 7243 pci_set_power_state(pdev, pci_choose_state(pdev, state));
7244 7244
7245 return 0; 7245 return 0;
7246} 7246}