pm_message_t vs. u32 confusion: warnings fixed
PATCH 1/1 pm_message_t vs. u32 confusion: warnings fixed
Fix some more u32 vs. pm_message_t confusion. These were causing "only" warnings. I decided to remove some debug prints instead of "fixing" them; they used to print constant "3" so I do not think it was *that* usefull.
Signed-off-by Pavel Machek <[email protected]>
---
author <pavel@amd.(none)> Tue, 12 Jul 2005 13:23:50 +0200 committer <pavel@amd.(none)> Tue, 12 Jul 2005 13:23:50 +0200
arch/i386/kernel/cpu/mtrr/main.c | 2 +- drivers/media/video/bttv-driver.c | 1 - drivers/media/video/msp3400.c | 4 ++-- drivers/media/video/tda9887.c | 2 +- drivers/media/video/tuner-core.c | 2 +- drivers/net/bnx2.c | 18 +++++++++--------- drivers/net/e1000/e1000_main.c | 16 +++++++--------- drivers/net/wireless/orinoco_pci.c | 2 -- drivers/net/wireless/prism54/islpci_hotplug.c | 2 -- drivers/video/s1d13xxxfb.c | 2 +- drivers/video/savagefb* 10 files changed, 22 insertions(+), 29 deletions(-)
arch/i386/kernel/cpu/mtrr/main.c +1 -1
@@ -561,7 +561,7 @@ struct mtrr_value {static struct mtrr_value * mtrr_state; -static int mtrr_save (struct sys_device * sysdev,u32 state) +static int mtrr_save (struct sys_device * sysdev,pm_message_t state) {int i;int size = num_var_ranges *sizeof (struct mtrr_value );
drivers/media/video/bttv-driver.c +0 -1
@@ -4043,7 +4043,6 @@ static int bttv_suspend(struct pci_dev *struct bttv_buffer_set idle;unsigned long flags; -dprintk ("bttv%d: suspend %d\n" , btv->c.nr, state);/* stop dma + irqs */ spin_lock_irqsave (&btv->s_lock,flags);
drivers/media/video/msp3400.c +2 -2
@@ -1431,7 +1431,7 @@ static int msp_detach(struct i2c_clientstatic int msp_probe (struct i2c_adapter *adap);static int msp_command (struct i2c_client *client,unsigned int cmd,void *arg); -static int msp_suspend (struct device * dev,u32 state,u32 level); +static int msp_suspend (struct device * dev,pm_message_t state,u32 level);static int msp_resume (struct device * dev,u32 level);static void msp_wake_thread (struct i2c_client *client);
@@ -1836,7 +1836,7 @@ static int msp_command(struct i2c_clientreturn 0 ; } -static int msp_suspend (struct device * dev,u32 state,u32 level) +static int msp_suspend (struct device * dev,pm_message_t state,u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev);
drivers/media/video/tda9887.c +1 -1
@@ -769,7 +769,7 @@ tda9887_command(struct i2c_client *clienreturn 0 ; } -static int tda9887_suspend (struct device * dev,u32 state,u32 level) +static int tda9887_suspend (struct device * dev,pm_message_t state,u32 level) {dprintk ("tda9887: suspend\n" );return 0 ;
drivers/media/video/tuner-core.c +1 -1
@@ -540,7 +540,7 @@ tuner_command(struct i2c_client *client,return 0 ; } -static int tuner_suspend (struct device * dev,u32 state,u32 level) +static int tuner_suspend (struct device * dev,pm_message_t state,u32 level) { struct i2c_client *c = container_of(dev, struct i2c_client, dev);struct tuner *t =i2c_get_clientdata (c);
drivers/net/bnx2.c +9 -9
@@ -1998,14 +1998,14 @@ bnx2_init_cpus(struct bnx2 *bp) }static int -bnx2_set_power_state (struct bnx2 *bp,int state) +bnx2_set_power_state (struct bnx2 *bp,pci_power_t state) {u16 pmcsr;pci_read_config_word (bp->pdev, bp->pm_cap +PCI_PM_CTRL , &pmcsr);switch (state) { -case 0 : { +case PCI_D0 : {u32 val; pci_write_config_word(bp->pdev, bp->pm_cap + PCI_PM_CTRL,
@@ -2026,7 +2026,7 @@ bnx2_set_power_state(struct bnx2 *bp, inREG_WR (bp,BNX2_RPM_CONFIG , val);break ; } -case 3 : { +case PCI_D3hot: {int i;u32 val, wol_msg;
@@ -3877,7 +3877,7 @@ bnx2_open(struct net_device *dev)struct bnx2 *bp = dev->priv;int rc; -bnx2_set_power_state (bp,0 ); +bnx2_set_power_state (bp,PCI_D0 );bnx2_disable_int (bp); rc =bnx2_alloc_mem (bp);
@@ -4190,7 +4190,7 @@ bnx2_close(struct net_device *dev)bnx2_free_mem (bp); bp->link_up =0 ;netif_carrier_off (bp->dev); -bnx2_set_power_state (bp,3 ); +bnx2_set_power_state (bp, PCI_D3hot);return 0 ; }
@@ -5192,7 +5192,7 @@ bnx2_init_board(struct pci_dev *pdev, stBNX2_PCICFG_MISC_CONFIG_REG_WINDOW_ENA | BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP); -bnx2_set_power_state (bp,0 ); +bnx2_set_power_state (bp,PCI_D0 ); bp->chip_id =REG_RD (bp,BNX2_MISC_ID );
@@ -5466,7 +5466,7 @@ bnx2_remove_one(struct pci_dev *pdev) }static int -bnx2_suspend (struct pci_dev *pdev,u32 state) +bnx2_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev);struct bnx2 *bp = dev->priv;
@@ -5484,7 +5484,7 @@ bnx2_suspend(struct pci_dev *pdev, u32 s reset_code =BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL ;bnx2_reset_chip (bp, reset_code);bnx2_free_skbs (bp); -bnx2_set_power_state (bp, state); +bnx2_set_power_state (bp,pci_choose_state (pdev, state));return 0 ; }
@@ -5497,7 +5497,7 @@ bnx2_resume(struct pci_dev *pdev)if (!netif_running (dev))return 0 ; -bnx2_set_power_state (bp,0 ); +bnx2_set_power_state (bp,PCI_D0 );netif_device_attach (dev);bnx2_init_nic (bp);bnx2_netif_start (bp);
drivers/net/e1000/e1000_main.c +7 -9
@@ -163,7 +163,7 @@ static void e1000_vlan_rx_kill_vid(strucstatic void e1000_restore_vlan (struct e1000_adapter *adapter);static int e1000_notify_reboot (struct notifier_block *,unsigned long event,void *ptr); -static int e1000_suspend (struct pci_dev *pdev,uint32_t state); +static int e1000_suspend (struct pci_dev *pdev,pm_message_t state);#ifdef CONFIG_PM static int e1000_resume (struct pci_dev *pdev);#endif
@@ -3662,14 +3662,14 @@ e1000_notify_reboot(struct notifier_bloccase SYS_POWER_OFF :while ((pdev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pdev))) {if (pci_dev_driver (pdev) == &e1000_driver) -e1000_suspend (pdev,3 ); +e1000_suspend (pdev,PMSG_SUSPEND ); } }return NOTIFY_DONE ; }static int -e1000_suspend (struct pci_dev *pdev,uint32_t state) +e1000_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *netdev =pci_get_drvdata (pdev);struct e1000_adapter *adapter =netdev_priv (netdev);
@@ -3753,9 +3753,7 @@ e1000_suspend(struct pci_dev *pdev, uint }pci_disable_device (pdev); - - state = (state >0 ) ?3 :0 ; -pci_set_power_state (pdev, state); +pci_set_power_state (pdev,pci_choose_state (pdev, state));return 0 ; }
@@ -3768,13 +3766,13 @@ e1000_resume(struct pci_dev *pdev)struct e1000_adapter *adapter =netdev_priv (netdev);uint32_t manc, ret_val, swsm; -pci_set_power_state (pdev,0 ); +pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); ret_val =pci_enable_device (pdev);pci_set_master (pdev); -pci_enable_wake (pdev,3 ,0 ); -pci_enable_wake (pdev,4 ,0 );/* 4 == D3 cold */ +pci_enable_wake (pdev, PCI_D3hot,0 ); +pci_enable_wake (pdev, PCI_D3cold,0 );e1000_reset (adapter);E1000_WRITE_REG (&adapter->hw,WUS , ~0 );
drivers/net/wireless/orinoco_pci.c +0 -2
@@ -301,8 +301,6 @@ static int orinoco_pci_suspend(struct pcunsigned long flags;int err; -printk (KERN_DEBUG "%s: Orinoco-PCI entering sleep mode (state=%d)\n" , - dev->name, state); err =orinoco_lock (priv, &flags);if (err) {
drivers/net/wireless/prism54/islpci_hotplug.c +0 -2
@@ -267,8 +267,6 @@ prism54_suspend(struct pci_dev *pdev, pmislpci_private *priv = ndev ?netdev_priv (ndev) :NULL ;BUG_ON (!priv); -printk (KERN_NOTICE "%s: got suspend request (state %d)\n" , - ndev->name, state);pci_save_state (pdev);
drivers/video/s1d13xxxfb.c +1 -1
@@ -655,7 +655,7 @@ bail: }#ifdef CONFIG_PM -static int s1d13xxxfb_suspend (struct device *dev,u32 state,u32 level) +static int s1d13xxxfb_suspend (struct device *dev,pm_message_t state,u32 level) {struct fb_info *info =dev_get_drvdata (dev);struct s1d13xxxfb_par *s1dfb = info->par;
drivers/video/savage/savagefb_driver.c +0 -1
@@ -2110,7 +2110,6 @@ static int savagefb_suspend (struct pci_struct savagefb_par *par = (struct savagefb_par *)info->par;DBG ("savagefb_suspend" ); -printk (KERN_DEBUG "state: %u\n" , state);acquire_console_sem ();fb_set_suspend (info,pci_choose_state (dev, state));