mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge remote-tracking branches 'asoc/topic/kcontrol', 'asoc/topic/max98357a' and 'asoc/topic/mtk' into asoc-next
This commit is contained in:
commit
9451a46928
6 changed files with 43 additions and 43 deletions
|
|
@ -92,8 +92,10 @@ struct snd_soc_tplg_kcontrol_ops {
|
|||
/* Bytes ext operations, for TLV byte controls */
|
||||
struct snd_soc_tplg_bytes_ext_ops {
|
||||
u32 id;
|
||||
int (*get)(unsigned int __user *bytes, unsigned int size);
|
||||
int (*put)(const unsigned int __user *bytes, unsigned int size);
|
||||
int (*get)(struct snd_kcontrol *kcontrol, unsigned int __user *bytes,
|
||||
unsigned int size);
|
||||
int (*put)(struct snd_kcontrol *kcontrol,
|
||||
const unsigned int __user *bytes, unsigned int size);
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1250,8 +1250,10 @@ struct soc_bytes_ext {
|
|||
struct snd_soc_dobj dobj;
|
||||
|
||||
/* used for TLV byte control */
|
||||
int (*get)(unsigned int __user *bytes, unsigned int size);
|
||||
int (*put)(const unsigned int __user *bytes, unsigned int size);
|
||||
int (*get)(struct snd_kcontrol *kcontrol, unsigned int __user *bytes,
|
||||
unsigned int size);
|
||||
int (*put)(struct snd_kcontrol *kcontrol, const unsigned int __user *bytes,
|
||||
unsigned int size);
|
||||
};
|
||||
|
||||
/* multi register control */
|
||||
|
|
|
|||
Loading…
Reference in a new issue