driver model: PM type conversions in drivers/net
Subsystems (2)
PATCH 1/1 driver model: PM type conversions in drivers/net
This fixes PM driver model type checking for drivers/net. Acked by Pavel Machek.
Signed-off-by Daniel Drake <[email protected]>
drivers/net/8139cp.c +1 -1
@@ -1862,7 +1862,7 @@ static void cp_remove_one (struct pci_de }#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 @@ static void bmac_init_chip(struct net_de }#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 @@ static void sa1100_irda_shutdown(struct/* * 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
@@ -1128,7 +1128,7 @@ static void stir_disconnect(struct usb_i#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 +4 -4
@@ -1737,7 +1737,7 @@ static void __devexit vlsi_irda_remove(s*/ -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;
@@ -1755,7 +1755,7 @@ static int vlsi_irda_suspend(struct pci_down (&idev->sem);if (pdev->current_state !=0 ) {/* already suspended */ if (state > pdev->current_state) {/* simply go deeper */ -pci_set_power_state (pdev,state); +pci_set_power_state (pdev,pci_choose_state (pdev, state)); pdev->current_state = state; }else
@@ -1774,7 +1774,7 @@ static int vlsi_irda_suspend(struct pci_ idev->new_baud = idev->baud; } -pci_set_power_state (pdev,state); +pci_set_power_state (pdev,pci_choose_state (pdev, state)); pdev->current_state = state; idev->resume_ok =1 ;up (&idev->sem);
@@ -1798,7 +1798,7 @@ static int vlsi_irda_resume(struct pci_dreturn 0 ; } -pci_set_power_state (pdev,0 ); +pci_set_power_state (pdev,PCI_D0 ); pdev->current_state =0 ;if (!idev->resume_ok) {
drivers/net/ixgb/ixgb_main.c +2 -2
@@ -2101,7 +2101,7 @@ ixgb_notify_reboot(struct notifier_block* @param state power state to enter **/ static int -ixgb_suspend (struct pci_dev *pdev,uint32_t state) +ixgb_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *netdev =pci_get_drvdata (pdev);struct ixgb_adapter *adapter = netdev->priv;
@@ -2113,7 +2113,7 @@ ixgb_suspend(struct pci_dev *pdev, uint3pci_save_state (pdev); - state = (state >0 ) ?3 :0 ; + state = (state >0 ) ? PCI_D3hot :PCI_D0 ;pci_set_power_state (pdev, state);msec_delay (200 );
drivers/net/ne2k-pci.c +1 -1
@@ -669,7 +669,7 @@ static int ne2k_pci_resume (struct pci_d {struct net_device *dev =pci_get_drvdata (pdev); -pci_set_power_state (pdev,0 ); +pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev);NS8390_init (dev,1 );netif_device_attach (dev);
drivers/net/pci-skeleton.c +1 -1
@@ -1897,7 +1897,7 @@ static void netdrv_set_rx_mode (struct n#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
@@ -1411,7 +1411,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);
drivers/net/skge.c +1 -1
@@ -3264,7 +3264,7 @@ static void __devexit skge_remove(struct }#ifdef CONFIG_PM -static int skge_suspend (struct pci_dev *pdev,u32 state) +static int skge_suspend (struct pci_dev *pdev,pm_message_t state) {struct skge_hw *hw =pci_get_drvdata (pdev);int i, wol =0 ;
drivers/net/smc91x.c +1 -1
@@ -2258,7 +2258,7 @@ static int smc_drv_remove(struct devicereturn 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 @@ static void __exit de_remove_one (struct#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 @@ static void __devexit w840_remove1 (stru* 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 +3 -3
@@ -1655,7 +1655,7 @@ MODULE_DEVICE_TABLE(pci, xircom_pci_tabl#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);
@@ -1665,7 +1665,7 @@ static int xircom_suspend(struct pci_devpci_save_state (pdev);pci_disable_device (pdev); -pci_set_power_state (pdev,3 ); +pci_set_power_state (pdev, PCI_D3hot);return 0 ; }
@@ -1677,7 +1677,7 @@ static int xircom_resume(struct pci_devstruct xircom_private *tp =netdev_priv (dev);printk (KERN_INFO "xircom_resume(%s)\n" , dev->name); -pci_set_power_state (pdev,0 ); +pci_set_power_state (pdev,PCI_D0 );pci_enable_device (pdev);pci_restore_state (pdev);
drivers/net/wireless/airo.c +7 -7
@@ -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 = {
@@ -1206,7 +1206,7 @@ struct airo_info {unsigned char __iomem *pciaux;unsigned char *shared;dma_addr_t shared_dma; -int power; +pm_message_t power;SsidRid *SSID ;APListRid *APList;#define PCI_SHARED_LEN 2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE
@@ -5464,7 +5464,7 @@ static void __devexit airo_pci_remove(st { } -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;
@@ -5489,9 +5489,9 @@ static int airo_pci_suspend(struct pci_d cmd.cmd=HOSTSLEEP ;issuecommand (ai, &cmd, &rsp); -pci_enable_wake (pdev, state,1 ); +pci_enable_wake (pdev,pci_choose_state (pdev, state),1 );pci_save_state (pdev); -return pci_set_power_state (pdev, state); +return pci_set_power_state (pdev,pci_choose_state (pdev, state)); }static int airo_pci_resume (struct pci_dev *pdev)
@@ -5500,7 +5500,7 @@ static int airo_pci_resume(struct pci_destruct airo_info *ai = dev->priv;Resp rsp; -pci_set_power_state (pdev,0 ); +pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev);pci_enable_wake (pdev, ai->power,0 );
@@ -5531,7 +5531,7 @@ static int airo_pci_resume(struct pci_de }writeConfigRid (ai,0 );enable_MAC (ai, &rsp,0 ); - ai->power =0 ; + ai->power =PCI_D0 ;netif_device_attach (dev);netif_wake_queue (dev);enable_interrupts (ai);
drivers/net/wireless/airport.c +1 -1
@@ -51,7 +51,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);
drivers/net/wireless/hostap/hostap_pci.c +2 -2
@@ -384,7 +384,7 @@ static void prism2_pci_remove(struct pci#ifdef CONFIG_PM -static int prism2_pci_suspend (struct pci_dev *pdev,u32 state) +static int prism2_pci_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev);
@@ -395,7 +395,7 @@ static int prism2_pci_suspend(struct pciprism2_hw_shutdown (dev,0 );pci_save_state (pdev);pci_disable_device (pdev); -pci_set_power_state (pdev,3 ); +pci_set_power_state (pdev, PCI_D3hot);return 0 ; }
drivers/net/wireless/orinoco_pci.c +1 -1
@@ -297,7 +297,7 @@ static void __devexit orinoco_pci_removepci_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);
drivers/net/wireless/prism54/islpci_hotplug.c +2 -2
@@ -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 ;
Quoted 16 lines · Daniel Drake
diff -urNpX dontdiff
linux-2.6.11-rc2-mm2/drivers/net/bmac.clinux-dsd/drivers/net/bmac.cdrivers/net/bmac.c +1
-1@@ -455,7 +455,7 @@ static void bmac_init_chip(struct net_de }#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 -urNpX dontdiff
linux-2.6.11-rc2-mm2/drivers/net/irda/sa1100_ir.clinux-dsd/drivers/net/irda/sa1100_ir.c
drivers/net/irda/sa1100_ir.c static void sa1100_irda_shutdown(struct · line 294
Quoted 5 lines
drivers/net/irda/sa1100_ir.c +1
-1@@ -291,7 +291,7 @@ static void sa1100_irda_shutdown(struct/* * 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)
Why does this one have three arguments?
Jeff
Quoted 1 line · Jeff Garzik
Why does this one have three arguments?
Because it's a platform device driver suspend method.
Signature · 4 lines
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core