projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
soc-dapm.c
diff --git
a/sound/soc/soc-dapm.c
b/sound/soc/soc-dapm.c
index 8863eddbac029975f9f7b4fefeac73b73bbcb6cf..6c79ca6df0bf284ba59e8075152e911518c7c2dc 100644
(file)
--- a/
sound/soc/soc-dapm.c
+++ b/
sound/soc/soc-dapm.c
@@
-1077,7
+1077,7
@@
EXPORT_SYMBOL_GPL(snd_soc_dapm_new_widgets);
/**
* snd_soc_dapm_get_volsw - dapm mixer get callback
* @kcontrol: mixer control
/**
* snd_soc_dapm_get_volsw - dapm mixer get callback
* @kcontrol: mixer control
- * @u
info
: control element information
+ * @u
control
: control element information
*
* Callback to get the value of a dapm mixer control.
*
*
* Callback to get the value of a dapm mixer control.
*
@@
-1122,7
+1122,7
@@
EXPORT_SYMBOL_GPL(snd_soc_dapm_get_volsw);
/**
* snd_soc_dapm_put_volsw - dapm mixer set callback
* @kcontrol: mixer control
/**
* snd_soc_dapm_put_volsw - dapm mixer set callback
* @kcontrol: mixer control
- * @u
info
: control element information
+ * @u
control
: control element information
*
* Callback to set the value of a dapm mixer control.
*
*
* Callback to set the value of a dapm mixer control.
*
@@
-1193,7
+1193,7
@@
EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);
/**
* snd_soc_dapm_get_enum_double - dapm enumerated double mixer get callback
* @kcontrol: mixer control
/**
* snd_soc_dapm_get_enum_double - dapm enumerated double mixer get callback
* @kcontrol: mixer control
- * @u
info
: control element information
+ * @u
control
: control element information
*
* Callback to get the value of a dapm enumerated double mixer control.
*
*
* Callback to get the value of a dapm enumerated double mixer control.
*
@@
-1221,7
+1221,7
@@
EXPORT_SYMBOL_GPL(snd_soc_dapm_get_enum_double);
/**
* snd_soc_dapm_put_enum_double - dapm enumerated double mixer set callback
* @kcontrol: mixer control
/**
* snd_soc_dapm_put_enum_double - dapm enumerated double mixer set callback
* @kcontrol: mixer control
- * @u
info
: control element information
+ * @u
control
: control element information
*
* Callback to set the value of a dapm enumerated double mixer control.
*
*
* Callback to set the value of a dapm enumerated double mixer control.
*
@@
-1419,7
+1419,7
@@
int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
/**
* snd_soc_dapm_enable_pin - enable pin.
/**
* snd_soc_dapm_enable_pin - enable pin.
- * @
snd_soc_
codec: SoC codec
+ * @codec: SoC codec
* @pin: pin name
*
* Enables input/output pin and it's parents or children widgets iff there is
* @pin: pin name
*
* Enables input/output pin and it's parents or children widgets iff there is