Commit 86a9bb5b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Drop CONFIG_PM ifdefs 

Practically seen, CONFIG_PM is almost mandatory.
Let's drop the ugly ifdef lines and simplify the code.

Link: https://lore.kernel.org/r/20211202084053.18201-1-tiwai@suse.de


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

sound/usb/card.c

+0 −7
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ void snd_usb_unlock_shutdown(struct snd_usb_audio *chip) 
		wake_up(&chip->shutdown_wait);

}



#ifdef CONFIG_PM



int snd_usb_autoresume(struct snd_usb_audio *chip)

{

	int i, err;
@@ -1100,11 +1098,6 @@ static int usb_audio_resume(struct usb_interface *intf) 
	atomic_dec(&chip->active); /* allow autopm after this point */

	return err;

}

#else

#define usb_audio_suspend	NULL

#define usb_audio_resume	NULL

#define usb_audio_resume	NULL

#endif		/* CONFIG_PM */



static const struct usb_device_id usb_audio_ids [] = {

#include "quirks-table.h"

sound/usb/mixer.c

+0 −4
Original line number Diff line number Diff line
@@ -3629,7 +3629,6 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) 
	mixer->disconnected = true;

}



#ifdef CONFIG_PM

/* stop any bus activity of a mixer */

static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)

{
@@ -3711,7 +3710,6 @@ int snd_usb_mixer_resume(struct usb_mixer_interface *mixer) 


	return snd_usb_mixer_activate(mixer);

}

#endif



void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list,

				 struct usb_mixer_interface *mixer,
@@ -3720,7 +3718,5 @@ void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, 
	list->mixer = mixer;

	list->id = unitid;

	list->dump = snd_usb_mixer_dump_cval;

#ifdef CONFIG_PM

	list->resume = restore_mixer_value;

#endif

}

sound/usb/mixer.h

+0 −2
Original line number Diff line number Diff line
@@ -118,10 +118,8 @@ void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, 
int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,

			  unsigned int size, unsigned int __user *_tlv);



#ifdef CONFIG_PM

int snd_usb_mixer_suspend(struct usb_mixer_interface *mixer);

int snd_usb_mixer_resume(struct usb_mixer_interface *mixer);

#endif



int snd_usb_set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,

                             int index, int value);

sound/usb/mixer_quirks.c

+0 −2
Original line number Diff line number Diff line
@@ -3280,7 +3280,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) 
	return err;

}



#ifdef CONFIG_PM

void snd_usb_mixer_resume_quirk(struct usb_mixer_interface *mixer)

{

	switch (mixer->chip->usb_id) {
@@ -3289,7 +3288,6 @@ void snd_usb_mixer_resume_quirk(struct usb_mixer_interface *mixer) 
		break;

	}

}

#endif



void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer,

				    int unitid)

sound/usb/mixer_quirks.h

+0 −2
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer, 
				  struct usb_mixer_elem_info *cval, int unitid,

				  struct snd_kcontrol *kctl);



#ifdef CONFIG_PM

void snd_usb_mixer_resume_quirk(struct usb_mixer_interface *mixer);

#endif



#endif /* SND_USB_MIXER_QUIRKS_H */