aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl10
-rw-r--r--include/sound/control.h1
-rw-r--r--sound/core/control.c5
3 files changed, 2 insertions, 14 deletions
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index ccd0a953953d..a319905c2c72 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -3691,16 +3691,6 @@ struct _snd_pcm_runtime {
3691 </para> 3691 </para>
3692 3692
3693 <para> 3693 <para>
3694 Here, the chip instance is retrieved via
3695 <function>snd_kcontrol_chip()</function> macro. This macro
3696 just accesses to kcontrol-&gt;private_data. The
3697 kcontrol-&gt;private_data field is
3698 given as the argument of <function>snd_ctl_new()</function>
3699 (see the later subsection
3700 <link linkend="control-interface-constructor"><citetitle>Constructor</citetitle></link>).
3701 </para>
3702
3703 <para>
3704 The <structfield>value</structfield> field is depending on 3694 The <structfield>value</structfield> field is depending on
3705 the type of control as well as on info callback. For example, 3695 the type of control as well as on info callback. For example,
3706 the sb driver uses this field to store the register offset, 3696 the sb driver uses this field to store the register offset,
diff --git a/include/sound/control.h b/include/sound/control.h
index 1de148b0fd94..f1361d6694ff 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -108,7 +108,6 @@ typedef int (*snd_kctl_ioctl_func_t) (struct snd_card * card,
108 108
109void snd_ctl_notify(struct snd_card * card, unsigned int mask, struct snd_ctl_elem_id * id); 109void snd_ctl_notify(struct snd_card * card, unsigned int mask, struct snd_ctl_elem_id * id);
110 110
111struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol * kcontrol, unsigned int access);
112struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, void * private_data); 111struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, void * private_data);
113void snd_ctl_free_one(struct snd_kcontrol * kcontrol); 112void snd_ctl_free_one(struct snd_kcontrol * kcontrol);
114int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol); 113int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol);
diff --git a/sound/core/control.c b/sound/core/control.c
index 67f09b8f85e4..42bcf2794b28 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -183,7 +183,8 @@ EXPORT_SYMBOL(snd_ctl_notify);
183 * 183 *
184 * Returns the pointer of the new instance, or NULL on failure. 184 * Returns the pointer of the new instance, or NULL on failure.
185 */ 185 */
186struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control, unsigned int access) 186static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,
187 unsigned int access)
187{ 188{
188 struct snd_kcontrol *kctl; 189 struct snd_kcontrol *kctl;
189 unsigned int idx; 190 unsigned int idx;
@@ -201,8 +202,6 @@ struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control, unsigned int acce
201 return kctl; 202 return kctl;
202} 203}
203 204
204EXPORT_SYMBOL(snd_ctl_new);
205
206/** 205/**
207 * snd_ctl_new1 - create a control instance from the template 206 * snd_ctl_new1 - create a control instance from the template
208 * @ncontrol: the initialization record 207 * @ncontrol: the initialization record