Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7247aabd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ctxfi: Simplify PM callbacks 



This is a similar cleanup like the commit [3db084fd: 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: default avatarTakashi Iwai <tiwai@suse.de>
parent b8375122

sound/pci/ctxfi/cthw20k1.c

+0 −9
Original line number Diff line number Diff line
@@ -2099,20 +2099,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);

}

sound/pci/ctxfi/cthw20k2.c

+0 −12
Original line number Diff line number Diff line
@@ -2209,24 +2209,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);

}