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.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |