diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-11 11:26:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-11 11:26:48 +0100 |
commit | 9e5947465d72ef1b3a88104474ab2adf78837220 (patch) | |
tree | 2e71fa8e496b8e047e5a90e81b685ed1f8d3ed7f /sound/pci/ctxfi | |
parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
download | linux-stable-9e5947465d72ef1b3a88104474ab2adf78837220.tar.gz linux-stable-9e5947465d72ef1b3a88104474ab2adf78837220.tar.bz2 linux-stable-9e5947465d72ef1b3a88104474ab2adf78837220.zip |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/ctxfi')
-rw-r--r-- | sound/pci/ctxfi/cthw20k1.c | 9 | ||||
-rw-r--r-- | sound/pci/ctxfi/cthw20k2.c | 12 |
2 files changed, 0 insertions, 21 deletions
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index b8b0d8ef9319..1cac55fd1139 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c @@ -2096,20 +2096,11 @@ static int hw_suspend(struct hw *hw) 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; } 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. */ return hw_card_init(hw, info); } diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index 4e16b4d05eed..955ad871e9a8 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c @@ -2206,24 +2206,12 @@ static int hw_card_init(struct hw *hw, struct card_conf *info) #ifdef CONFIG_PM_SLEEP static int hw_suspend(struct hw *hw) { - struct pci_dev *pci = hw->pci; - hw_card_stop(hw); - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); - return 0; } 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. */ return hw_card_init(hw, info); } |