Skip to content

Commit

Permalink
[PATCH] u32 vs. pm_message_t fixes for drivers/net
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Pavel Machek authored and Linus Torvalds committed Apr 16, 2005
1 parent 4fd416c commit 05adc3b
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/irda/sa1100_ir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/irda/vlsi_ir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/pci-skeleton.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/r8169.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/smc91x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/tulip/de2104x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/tulip/winbond-840.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/tulip/xircom_tulip_cb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/typhoon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -2287,7 +2287,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)
}

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);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/airo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/airport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/orinoco_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/prism54/islpci_hotplug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 05adc3b

Please sign in to comment.