diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/airo.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/airport.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco_pci.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_hotplug.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 2899144f2153..463c789cdc77 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -61,7 +61,7 @@ MODULE_DEVICE_TABLE(pci, card_ids); static int airo_pci_probe(struct pci_dev *, const struct pci_device_id *); static void airo_pci_remove(struct pci_dev *); -static int airo_pci_suspend(struct pci_dev *pdev, u32 state); +static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state); static int airo_pci_resume(struct pci_dev *pdev); static struct pci_driver airo_driver = { @@ -5464,7 +5464,7 @@ static void __devexit airo_pci_remove(struct pci_dev *pdev) { } -static int airo_pci_suspend(struct pci_dev *pdev, u32 state) +static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pdev); struct airo_info *ai = dev->priv; diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index a1dc2a196087..b4f4bd7956a2 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c @@ -50,7 +50,7 @@ struct airport { }; static int -airport_suspend(struct macio_dev *mdev, u32 state) +airport_suspend(struct macio_dev *mdev, pm_message_t state) { struct net_device *dev = dev_get_drvdata(&mdev->ofdev.dev); struct orinoco_private *priv = netdev_priv(dev); diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index ff30d37e12e2..7a6f52ea7faa 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c @@ -294,7 +294,7 @@ static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) pci_disable_device(pdev); } -static int orinoco_pci_suspend(struct pci_dev *pdev, u32 state) +static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pdev); struct orinoco_private *priv = netdev_priv(dev); @@ -323,7 +323,7 @@ static int orinoco_pci_suspend(struct pci_dev *pdev, u32 state) orinoco_unlock(priv, &flags); pci_save_state(pdev); - pci_set_power_state(pdev, 3); + pci_set_power_state(pdev, PCI_D3hot); return 0; } diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c index efd4d213ac3d..c17391d947f3 100644 --- a/drivers/net/wireless/prism54/islpci_hotplug.c +++ b/drivers/net/wireless/prism54/islpci_hotplug.c @@ -81,7 +81,7 @@ MODULE_DEVICE_TABLE(pci, prism54_id_tbl); static int prism54_probe(struct pci_dev *, const struct pci_device_id *); static void prism54_remove(struct pci_dev *); -static int prism54_suspend(struct pci_dev *, u32 state); +static int prism54_suspend(struct pci_dev *, pm_message_t state); static int prism54_resume(struct pci_dev *); static struct pci_driver prism54_driver = { @@ -261,7 +261,7 @@ prism54_remove(struct pci_dev *pdev) } int -prism54_suspend(struct pci_dev *pdev, u32 state) +prism54_suspend(struct pci_dev *pdev, pm_message_t state) { struct net_device *ndev = pci_get_drvdata(pdev); islpci_private *priv = ndev ? netdev_priv(ndev) : NULL; |