u32 vs. pm_message_t fixes for drivers/net
Subsystems (2)
Hi!
This fixes remaining u32s in drivers/ net. [These patches are independend].
Please apply,
Signed-off-by Pavel Machek <[email protected]>
Pavel
drivers/net/8139cp.c +1 -1
@@ -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;
drivers/net/bmac.c +1 -1
@@ -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);
drivers/net/irda/sa1100_ir.c +1 -1
@@ -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;
drivers/net/irda/stir4200.c +1 -1
@@ -1129,7 +1129,7 @@#ifdef CONFIG_PM /* Power management suspend, so power off the transmitter/receiver */ -static int stir_suspend (struct usb_interface *intf,u32 state) +static int stir_suspend (struct usb_interface *intf,pm_message_t state) {struct stir_cb *stir =usb_get_intfdata (intf);
drivers/net/irda/vlsi_ir.c +1 -1
@@ -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;
drivers/net/pci-skeleton.c +1 -1
@@ -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;
drivers/net/r8169.c +1 -1
@@ -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);
drivers/net/smc91x.c +1 -1
@@ -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);
drivers/net/tulip/de2104x.c +1 -1
@@ -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;
drivers/net/tulip/winbond-840.c +1 -1
@@ -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);
drivers/net/tulip/xircom_tulip_cb.c +1 -1
@@ -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);
drivers/net/typhoon.c +2 -2
@@ -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); }
drivers/net/wireless/airo.c +2 -2
@@ -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;
drivers/net/wireless/airport.c +1 -1
@@ -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);
drivers/net/wireless/orinoco_pci.c +2 -2
@@ -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 ; }
drivers/net/wireless/prism54/islpci_hotplug.c +2 -2
@@ -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 ;
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!