A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "ALSA: PCM: User control API implementation"

Browse source 
This reverts commit 8625c90a01.
This change has been moved out of ASoC.

Change-Id: Ifc18eed2e21925f6edcf746902e1fe22a58774a4
Signed-off-by: Meng Wang <[email protected]>
This commit is contained in:
Meng Wang 2020-05-08 08:17:22 +08:00 • committed by Gerrit - the friendly Code Review server
commit 8e47f98c27
3 changed files with 1 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

27
include/sound/pcm.h
View file

@ -513,7 +513,6 @@ struct snd_pcm_str {
struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */
#ifdef CONFIG_AUDIO_QGKI
struct snd_kcontrol *vol_kctl; /* volume controls */
struct snd_kcontrol *usr_kctl; /* user controls */
#endif
struct device dev;
};
@ -1433,7 +1432,6 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format)
#ifdef CONFIG_AUDIO_QGKI
#define SND_PCM_ADD_VOLUME_CTL 1
#define SND_PCM_ADD_USR_CTL 1
/*
* PCM Volume control API
*/
@ -1457,31 +1455,8 @@ int snd_pcm_add_volume_ctls(struct snd_pcm *pcm, int stream,
int max_length,
unsigned long private_value,
struct snd_pcm_volume **info_ret);
/*
* PCM User control API
*/
/* array element of usr elem */
struct snd_pcm_usr_elem {
int val[128];
};
/* pp information; retrieved via snd_kcontrol_chip() */
struct snd_pcm_usr {
struct snd_pcm *pcm; /* assigned PCM instance */
int stream; /* PLAYBACK or CAPTURE */
struct snd_kcontrol *kctl;
const struct snd_pcm_usr_elem *usr;
int max_length;
void *private_data; /* optional: private data pointer */
};
int snd_pcm_add_usr_ctls(struct snd_pcm *pcm, int stream,
const struct snd_pcm_usr_elem *usr,
int max_length, int max_control_str_len,
unsigned long private_value,
struct snd_pcm_usr **info_ret);
#endif
/* printk helpers */
#define pcm_err(pcm, fmt, args...) \
dev_err((pcm)->card->dev, fmt, ##args)