A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] pm: more u32 vs. pm_message_t fixes

Browse source 
Few more u32 vs. pm_message_t fixes.

Signed-off-by: Pavel Machek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Pavel Machek 2005-07-07 17:56:40 -07:00 • committed by Linus Torvalds
commit 2a569579be
7 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/skge.c
View file

@ -3259,7 +3259,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
}
#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;
@ -3279,7 +3279,7 @@ static int skge_suspend(struct pci_dev *pdev, u32 state)
}
pci_save_state(pdev);
pci_enable_wake(pdev, state, wol);
pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);
pci_disable_device(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));

6
drivers/net/typhoon.c
View file

@ -1906,9 +1906,9 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events)
*/
netif_carrier_off(tp->dev);
pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1);
pci_enable_wake(tp->pdev, state, 1);
pci_disable_device(pdev);
return pci_set_power_state(pdev, pci_choose_state(pdev, state));
return pci_set_power_state(pdev, state);
}
static int
@ -2274,7 +2274,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)
goto need_resume;
}
if(typhoon_sleep(tp, state, tp->wol_events) < 0) {
if(typhoon_sleep(tp, pci_choose_state(pdev, state), tp->wol_events) < 0) {
printk(KERN_ERR "%s: unable to put card to sleep\n", dev->name);
goto need_resume;
}