luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: ctxfi: Simplify PM callbacks

Browse Source 
This is a similar cleanup like the commit [3db084fd0af5: ALSA: fm801:
PCI core handles power state for us].

Since pci_set_power_state(), pci_save_state() and pci_restore_state()
are already done in the PCI core side, so we don't need to it doubly.

Also, pci_enable_device(), pci_disable_device() and pci_set_master()
calls in PM callbacks are superfluous nowadays, too, so get rid of
them as well.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-08 12:45:55 +01:00
parent b8375122b5
commit 7247aabd5a
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/ctxfi/cthw20k1.c
View File

@ -2099,20 +2099,11 @@ static int hw_suspend(struct hw *hw)
pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x0); pci_write_config_dword(pci, UAA_CFG_SPACE_FLAG, 0x0);
} }
pci_disable_device(pci);
pci_save_state(pci);
pci_set_power_state(pci, PCI_D3hot);
return 0; return 0;
} }
static int hw_resume(struct hw *hw, struct card_conf *info) static int hw_resume(struct hw *hw, struct card_conf *info)
{ {
struct pci_dev *pci = hw->pci;
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
/* Re-initialize card hardware. */ /* Re-initialize card hardware. */
return hw_card_init(hw, info); return hw_card_init(hw, info);
} }

12
sound/pci/ctxfi/cthw20k2.c
View File

@ -2209,24 +2209,12 @@ static int hw_card_init(struct hw *hw, struct card_conf *info)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int hw_suspend(struct hw *hw) static int hw_suspend(struct hw *hw)
{ {
struct pci_dev *pci = hw->pci;
hw_card_stop(hw); hw_card_stop(hw);
pci_disable_device(pci);
pci_save_state(pci);
pci_set_power_state(pci, PCI_D3hot);
return 0; return 0;
} }
static int hw_resume(struct hw *hw, struct card_conf *info) static int hw_resume(struct hw *hw, struct card_conf *info)
{ {
struct pci_dev *pci = hw->pci;
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
/* Re-initialize card hardware. */ /* Re-initialize card hardware. */
return hw_card_init(hw, info); return hw_card_init(hw, info);
} }