fix pm_message_t stuff in -mm tree
PATCH 4/4 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].
drivers/net/wireless/hostap/hostap_pci.c +2 -2
@@ -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 ; }
drivers/net/wireless/ipw2200.c +2 -2
@@ -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 ; }
drivers/perfctr/x86.c +1 -1
@@ -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 ;
Signature · 1 line
teflon -- maybe it is a trademark, but it should not be.