ALSA: trident: Simplify PM callbacks
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:
Родитель
5b3985ecdc
Коммит
6f9eb021f7
|
@ -3926,7 +3926,6 @@ static void snd_trident_clear_voices(struct snd_trident * trident, unsigned shor
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
static int snd_trident_suspend(struct device *dev)
|
static int snd_trident_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci = to_pci_dev(dev);
|
|
||||||
struct snd_card *card = dev_get_drvdata(dev);
|
struct snd_card *card = dev_get_drvdata(dev);
|
||||||
struct snd_trident *trident = card->private_data;
|
struct snd_trident *trident = card->private_data;
|
||||||
|
|
||||||
|
@ -3938,28 +3937,14 @@ static int snd_trident_suspend(struct device *dev)
|
||||||
|
|
||||||
snd_ac97_suspend(trident->ac97);
|
snd_ac97_suspend(trident->ac97);
|
||||||
snd_ac97_suspend(trident->ac97_sec);
|
snd_ac97_suspend(trident->ac97_sec);
|
||||||
|
|
||||||
pci_disable_device(pci);
|
|
||||||
pci_save_state(pci);
|
|
||||||
pci_set_power_state(pci, PCI_D3hot);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int snd_trident_resume(struct device *dev)
|
static int snd_trident_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pci = to_pci_dev(dev);
|
|
||||||
struct snd_card *card = dev_get_drvdata(dev);
|
struct snd_card *card = dev_get_drvdata(dev);
|
||||||
struct snd_trident *trident = card->private_data;
|
struct snd_trident *trident = card->private_data;
|
||||||
|
|
||||||
pci_set_power_state(pci, PCI_D0);
|
|
||||||
pci_restore_state(pci);
|
|
||||||
if (pci_enable_device(pci) < 0) {
|
|
||||||
dev_err(dev, "pci_enable_device failed, disabling device\n");
|
|
||||||
snd_card_disconnect(card);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
pci_set_master(pci);
|
|
||||||
|
|
||||||
switch (trident->device) {
|
switch (trident->device) {
|
||||||
case TRIDENT_DEVICE_ID_DX:
|
case TRIDENT_DEVICE_ID_DX:
|
||||||
snd_trident_4d_dx_init(trident);
|
snd_trident_4d_dx_init(trident);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче