Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05adc3b7 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

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



This fixes remaining u32s in drivers/ net.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4fd416c1

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/bmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/irda/sa1100_ir.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/irda/vlsi_ir.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/pci-skeleton.c

+1 −1
Original line number Diff line number Diff line
@@ -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;