提交 583a4e88 编写于 作者: P Pavel Machek 提交者: Linus Torvalds

[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: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 ca078bae
......@@ -416,7 +416,7 @@ static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
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;
}
......
......@@ -7225,7 +7225,7 @@ static void ipw_pci_remove(struct pci_dev *pdev)
#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;
......@@ -7240,7 +7240,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, state);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册