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

Commit 68cb2b55 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Convert to new pm_ops for PCI drivers 



Straightforward conversion to the new pm_ops from the legacy
suspend/resume ops.

Since we change vx222, vx_core and vxpocket have to be converted,
too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 284e7ca7

include/sound/cs46xx.h

+1 −2
Original line number Diff line number Diff line
@@ -1730,8 +1730,7 @@ int snd_cs46xx_create(struct snd_card *card, 
		      struct pci_dev *pci,

		      int external_amp, int thinkpad,

		      struct snd_cs46xx **rcodec);

int snd_cs46xx_suspend(struct pci_dev *pci, pm_message_t state);

int snd_cs46xx_resume(struct pci_dev *pci);

extern const struct dev_pm_ops snd_cs46xx_pm;



int snd_cs46xx_pcm(struct snd_cs46xx *chip, int device, struct snd_pcm **rpcm);

int snd_cs46xx_pcm_rear(struct snd_cs46xx *chip, int device, struct snd_pcm **rpcm);

include/sound/trident.h

+1 −2
Original line number Diff line number Diff line
@@ -430,8 +430,7 @@ void snd_trident_free_voice(struct snd_trident * trident, struct snd_trident_voi 
void snd_trident_start_voice(struct snd_trident * trident, unsigned int voice);

void snd_trident_stop_voice(struct snd_trident * trident, unsigned int voice);

void snd_trident_write_voice_regs(struct snd_trident * trident, struct snd_trident_voice *voice);

int snd_trident_suspend(struct pci_dev *pci, pm_message_t state);

int snd_trident_resume(struct pci_dev *pci);

extern const struct dev_pm_ops snd_trident_pm;



/* TLB memory allocation */

struct snd_util_memblk *snd_trident_alloc_pages(struct snd_trident *trident,

include/sound/vx_core.h

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ int vx_change_frequency(struct vx_core *chip); 
/*

 * PM

 */

int snd_vx_suspend(struct vx_core *card, pm_message_t state);

int snd_vx_suspend(struct vx_core *card);

int snd_vx_resume(struct vx_core *card);



/*

include/sound/ymfpci.h

+1 −2
Original line number Diff line number Diff line
@@ -377,8 +377,7 @@ int snd_ymfpci_create(struct snd_card *card, 
		      struct snd_ymfpci ** rcodec);

void snd_ymfpci_free_gameport(struct snd_ymfpci *chip);



int snd_ymfpci_suspend(struct pci_dev *pci, pm_message_t state);

int snd_ymfpci_resume(struct pci_dev *pci);

extern const struct dev_pm_ops snd_ymfpci_pm;



int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);

int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);

sound/drivers/vx/vx_core.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ EXPORT_SYMBOL(snd_vx_dsp_load); 
/*

 * suspend

 */

int snd_vx_suspend(struct vx_core *chip, pm_message_t state)

int snd_vx_suspend(struct vx_core *chip)

{

	unsigned int i;