tree b7ec16681719bfd3caac350a750b50ed5a4abf50
parent 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:25 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:25 -0700
[PATCH] u32 vs. pm_message_t fixes for drivers/net
This fixes remaining u32s in drivers/ net.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
net/8139cp.c | 2 +-
net/bmac.c | 2 +-
net/irda/sa1100_ir.c | 2 +-
net/irda/vlsi_ir.c | 2 +-
net/pci-skeleton.c | 2 +-
net/r8169.c | 2 +-
net/smc91x.c | 2 +-
net/tulip/de2104x.c | 2 +-
net/tulip/winbond-840.c | 2 +-
net/tulip/xircom_tulip_cb.c | 2 +-
net/typhoon.c | 4 ++--
net/wireless/airo.c | 4 ++--
net/wireless/airport.c | 2 +-
net/wireless/orinoco_pci.c | 4 ++--
net/wireless/prism54/islpci_hotplug.c | 4 ++--
15 files changed, 19 insertions(+), 19 deletions(-)
Index: drivers/net/8139cp.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/8139cp.c (mode:100644
sha1:58c6a85c3aa250213c9afff50bfc9535b66d937a)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/8139cp.c (mode:100644
sha1:d639cb8dc461c85ccf04cc2da6cfd4f8c7b963c1)
@@ -1824,7 +1824,7 @@
}
#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;
Index: drivers/net/bmac.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/bmac.c (mode:100644
sha1:3d2be7c28e06fc4be366173c0a2fc60a234ecab7)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/bmac.c (mode:100644
sha1:734bd4ee3f9b99f8dbe867b36e5a010dfd633632)
@@ -455,7 +455,7 @@
}
#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);
Index: drivers/net/irda/sa1100_ir.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/irda/sa1100_ir.c
(mode:100644 sha1:89f5096cab74a2449df15cbd2f8b0387f46889b2)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/irda/sa1100_ir.c
(mode:100644 sha1:8d34ac60d90679ea54c2c3c48a9db6a3dbce146c)
@@ -291,7 +291,7 @@
/*
* 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;
Index: drivers/net/irda/vlsi_ir.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/irda/vlsi_ir.c
(mode:100644 sha1:35fad8171a01beb66b157ee842c4736ea9e612c0)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/irda/vlsi_ir.c
(mode:100644 sha1:006e4f57560675bb48a19b62fa6ec54fd0158337)
@@ -1744,7 +1744,7 @@
*/
-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;
Index: drivers/net/pci-skeleton.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/pci-skeleton.c
(mode:100644 sha1:bb1c3d8981ee305e96c04d7ba11fc0f561011efa)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/pci-skeleton.c
(mode:100644 sha1:4a391ea0f58aaa4771975a5eff2e0ce338e9dd54)
@@ -1897,7 +1897,7 @@
#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;
Index: drivers/net/r8169.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/r8169.c (mode:100644
sha1:434e4ff967b2dbfb994834dbbdd0ed98824d6a1a)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/r8169.c (mode:100644
sha1:07e2df09491f207d5b27da4895668b68dca3bd43)
@@ -1449,7 +1449,7 @@
#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);
Index: drivers/net/smc91x.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/smc91x.c (mode:100644
sha1:6766bacbb199d6d33321a7950d460bbb2f66872f)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/smc91x.c (mode:100644
sha1:5e561ba4433330ee2e49675f2805f3e03457715d)
@@ -2278,7 +2278,7 @@
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);
Index: drivers/net/tulip/de2104x.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/tulip/de2104x.c
(mode:100644 sha1:008e19210e66f01fbaef1aba30243850766b8b12)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/tulip/de2104x.c
(mode:100644 sha1:dd357dd8c370282f6533fec7417b89b5f9a9f390)
@@ -2102,7 +2102,7 @@
#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;
Index: drivers/net/tulip/winbond-840.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/tulip/winbond-840.c
(mode:100644 sha1:f7e64ee11b1d11bd8c936048d0da486398a243f2)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/tulip/winbond-840.c
(mode:100644 sha1:caff2f5901657a1533b7e83e177d43bae2cccc51)
@@ -1620,7 +1620,7 @@
* 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);
Index: drivers/net/tulip/xircom_tulip_cb.c
===================================================================
---
4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/tulip/xircom_tulip_cb.c
(mode:100644 sha1:32ccb26890c3ced101e7696d2150b0ee5e5b6bd5)
+++
b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/tulip/xircom_tulip_cb.c
(mode:100644 sha1:b8a9b395c5ea17a5b842646e64f89e5e9faf78b2)
@@ -1655,7 +1655,7 @@
#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);
Index: drivers/net/typhoon.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/typhoon.c
(mode:100644 sha1:b0d337f7f545c9a43d2311d0dd3f5394714cd2bc)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/typhoon.c
(mode:100644 sha1:8f3392989a06e83188a1323341d04ff3f4176bca)
@@ -1906,7 +1906,7 @@
*/
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 @@
}
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);
}
Index: drivers/net/wireless/airo.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/wireless/airo.c
(mode:100644 sha1:2899144f21537d43ba5805a8c402a92d1ba3b96c)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/wireless/airo.c
(mode:100644 sha1:463c789cdc77c5e9705e656277050a47b76523ee)
@@ -61,7 +61,7 @@
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 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;
Index: drivers/net/wireless/airport.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/wireless/airport.c
(mode:100644 sha1:a1dc2a196087824706f5299c6c8cc349cd5e7595)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/wireless/airport.c
(mode:100644 sha1:b4f4bd7956a24f18e1873c129b942391af158b9c)
@@ -50,7 +50,7 @@
};
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);
Index: drivers/net/wireless/orinoco_pci.c
===================================================================
--- 4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/wireless/orinoco_pci.c
(mode:100644 sha1:ff30d37e12e203e31d9a1d065f718f679edf859a)
+++ b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/wireless/orinoco_pci.c
(mode:100644 sha1:7a6f52ea7faa306ac5f4af3525528d5754a5fe4e)
@@ -294,7 +294,7 @@
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 @@
orinoco_unlock(priv, &flags);
pci_save_state(pdev);
- pci_set_power_state(pdev, 3);
+ pci_set_power_state(pdev, PCI_D3hot);
return 0;
}
Index: drivers/net/wireless/prism54/islpci_hotplug.c
===================================================================
---
4836046f082166b604e43eb3c6009682007ba5fe/drivers/net/wireless/prism54/islpci_hotplug.c
(mode:100644 sha1:efd4d213ac3deb792a5cd123b50ecdf4f7748ea3)
+++
b7ec16681719bfd3caac350a750b50ed5a4abf50/drivers/net/wireless/prism54/islpci_hotplug.c
(mode:100644 sha1:c17391d947f31a30460d50b6ae56a072dd24b5aa)
@@ -81,7 +81,7 @@
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 @@
}
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;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
