[PATCH] u32 vs. pm_message_t fixes for drivers/net

This fixes remaining u32s in drivers/ net.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 58c6a85c3aa250213c9afff50bfc9535b66d937a..d639cb8dc461c85ccf04cc2da6cfd4f8c7b963c1 100644 (file)
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1824,7 +1824,7 @@ static void cp_remove_one (struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_PM
-static int cp_suspend (struct pci_dev *pdev, u32 state)
+static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev;
        struct cp_private *cp;

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 3d2be7c28e06fc4be366173c0a2fc60a234ecab7..734bd4ee3f9b99f8dbe867b36e5a010dfd633632 100644 (file)
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -455,7 +455,7 @@ static void bmac_init_chip(struct net_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int bmac_suspend(struct macio_dev *mdev, u32 state)
+static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)
 {
        struct net_device* dev = macio_get_drvdata(mdev);       
        struct bmac_data *bp = netdev_priv(dev);

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 89f5096cab74a2449df15cbd2f8b0387f46889b2..8d34ac60d90679ea54c2c3c48a9db6a3dbce146c 100644 (file)
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -291,7 +291,7 @@ static void sa1100_irda_shutdown(struct sa1100_irda *si)
 /*
  * Suspend the IrDA interface.
  */
-static int sa1100_irda_suspend(struct device *_dev, u32 state, u32 level)
+static int sa1100_irda_suspend(struct device *_dev, pm_message_t state, u32 level)
 {
        struct net_device *dev = dev_get_drvdata(_dev);
        struct sa1100_irda *si;

diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 35fad8171a01beb66b157ee842c4736ea9e612c0..006e4f57560675bb48a19b62fa6ec54fd0158337 100644 (file)
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1744,7 +1744,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
  */
 
 
-static int vlsi_irda_suspend(struct pci_dev *pdev, u32 state)
+static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *ndev = pci_get_drvdata(pdev);
        vlsi_irda_dev_t *idev;

diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index bb1c3d8981ee305e96c04d7ba11fc0f561011efa..4a391ea0f58aaa4771975a5eff2e0ce338e9dd54 100644 (file)
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -1897,7 +1897,7 @@ static void netdrv_set_rx_mode (struct net_device *dev)
 
 #ifdef CONFIG_PM
 
-static int netdrv_suspend (struct pci_dev *pdev, u32 state)
+static int netdrv_suspend (struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata (pdev);
        struct netdrv_private *tp = dev->priv;

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 434e4ff967b2dbfb994834dbbdd0ed98824d6a1a..07e2df09491f207d5b27da4895668b68dca3bd43 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1449,7 +1449,7 @@ rtl8169_remove_one(struct pci_dev *pdev)
 
 #ifdef CONFIG_PM
 
-static int rtl8169_suspend(struct pci_dev *pdev, u32 state)
+static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
        struct rtl8169_private *tp = netdev_priv(dev);

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 6766bacbb199d6d33321a7950d460bbb2f66872f..5e561ba4433330ee2e49675f2805f3e03457715d 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2278,7 +2278,7 @@ static int smc_drv_remove(struct device *dev)
        return 0;
 }
 
-static int smc_drv_suspend(struct device *dev, u32 state, u32 level)
+static int smc_drv_suspend(struct device *dev, pm_message_t state, u32 level)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
 

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 008e19210e66f01fbaef1aba30243850766b8b12..dd357dd8c370282f6533fec7417b89b5f9a9f390 100644 (file)
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -2102,7 +2102,7 @@ static void __exit de_remove_one (struct pci_dev *pdev)
 
 #ifdef CONFIG_PM
 
-static int de_suspend (struct pci_dev *pdev, u32 state)
+static int de_suspend (struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata (pdev);
        struct de_private *de = dev->priv;

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index f7e64ee11b1d11bd8c936048d0da486398a243f2..caff2f5901657a1533b7e83e177d43bae2cccc51 100644 (file)
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1620,7 +1620,7 @@ static void __devexit w840_remove1 (struct pci_dev *pdev)
  * Detach must occur under spin_unlock_irq(), interrupts from a detached
  * device would cause an irq storm.
  */
-static int w840_suspend (struct pci_dev *pdev, u32 state)
+static int w840_suspend (struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata (pdev);
        struct netdev_private *np = netdev_priv(dev);

diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 32ccb26890c3ced101e7696d2150b0ee5e5b6bd5..b8a9b395c5ea17a5b842646e64f89e5e9faf78b2 100644 (file)
--- a/drivers/net/tulip/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c
@@ -1655,7 +1655,7 @@ MODULE_DEVICE_TABLE(pci, xircom_pci_table);
 
 
 #ifdef CONFIG_PM
-static int xircom_suspend(struct pci_dev *pdev, u32 state)
+static int xircom_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
        struct xircom_private *tp = netdev_priv(dev);

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index b0d337f7f545c9a43d2311d0dd3f5394714cd2bc..8f3392989a06e83188a1323341d04ff3f4176bca 100644 (file)
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -1906,7 +1906,7 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events)
         */
        netif_carrier_off(tp->dev);
 
-       pci_enable_wake(tp->pdev, state, 1);
+       pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1);
        pci_disable_device(pdev);
        return pci_set_power_state(pdev, pci_choose_state(pdev, state));
 }
@@ -2287,7 +2287,7 @@ need_resume:
 }
 
 static int
-typhoon_enable_wake(struct pci_dev *pdev, u32 state, int enable)
+typhoon_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable)
 {
        return pci_enable_wake(pdev, state, enable);
 }

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 2899144f21537d43ba5805a8c402a92d1ba3b96c..463c789cdc77c5e9705e656277050a47b76523ee 100644 (file)
--- 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 a1dc2a196087824706f5299c6c8cc349cd5e7595..b4f4bd7956a24f18e1873c129b942391af158b9c 100644 (file)
--- 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 ff30d37e12e203e31d9a1d065f718f679edf859a..7a6f52ea7faa306ac5f4af3525528d5754a5fe4e 100644 (file)
--- 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 efd4d213ac3deb792a5cd123b50ecdf4f7748ea3..c17391d947f31a30460d50b6ae56a072dd24b5aa 100644 (file)
--- 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;