Skip to content

L
linux
Commit 9ab0cb30 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: Replace the word "slave" in vmaster API 

Follow the recent inclusive terminology guidelines and replace the
word "slave" in vmaster API.  I chose the word "follower" at this time
since it seems fitting for the purpose.

Note that the word "master" is kept in API, since it refers rather to
audio master volume control.

Also, while we're at it, a typo in comments is corrected, too.

Link: https://lore.kernel.org/r/20200717154517.27599-1-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6779ec13
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 267 deletions
include/sound/control.h
View file @ 9ab0cb30
...@@ -188,20 +188,21 @@ int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels, ...@@ -188,20 +188,21 @@ int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
*/ */
struct snd_kcontrol *snd_ctl_make_virtual_master(char *name, struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
const unsigned int *tlv); const unsigned int *tlv);
int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave, int _snd_ctl_add_follower(struct snd_kcontrol *master,
unsigned int flags); struct snd_kcontrol *follower,
/* optional flags for slave */ unsigned int flags);
#define SND_CTL_SLAVE_NEED_UPDATE (1 << 0) /* optional flags for follower */
#define SND_CTL_FOLLOWER_NEED_UPDATE (1 << 0)
/** /**
* snd_ctl_add_slave - Add a virtual slave control * snd_ctl_add_follower - Add a virtual follower control
* @master: vmaster element * @master: vmaster element
* @slave: slave element to add * @follower: follower element to add
* *
* Add a virtual slave control to the given master element created via * Add a virtual follower control to the given master element created via
* snd_ctl_create_virtual_master() beforehand. * snd_ctl_create_virtual_master() beforehand.
* *
* All slaves must be the same type (returning the same information * All followers must be the same type (returning the same information
* via info callback). The function doesn't check it, so it's your * via info callback). The function doesn't check it, so it's your
* responsibility. * responsibility.
* *
...@@ -213,18 +214,18 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave, ...@@ -213,18 +214,18 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
* Return: Zero if successful or a negative error code. * Return: Zero if successful or a negative error code.
*/ */
static inline int static inline int
snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave) snd_ctl_add_follower(struct snd_kcontrol *master, struct snd_kcontrol *follower)
{ {
return _snd_ctl_add_slave(master, slave, 0); return _snd_ctl_add_follower(master, follower, 0);
} }
/** /**
* snd_ctl_add_slave_uncached - Add a virtual slave control * snd_ctl_add_follower_uncached - Add a virtual follower control
* @master: vmaster element * @master: vmaster element
* @slave: slave element to add * @follower: follower element to add
* *
* Add a virtual slave control to the given master. * Add a virtual follower control to the given master.
* Unlike snd_ctl_add_slave(), the element added via this function * Unlike snd_ctl_add_follower(), the element added via this function
* is supposed to have volatile values, and get callback is called * is supposed to have volatile values, and get callback is called
* at each time queried from the master. * at each time queried from the master.
* *
...@@ -235,10 +236,10 @@ snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave) ...@@ -235,10 +236,10 @@ snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
* Return: Zero if successful or a negative error code. * Return: Zero if successful or a negative error code.
*/ */
static inline int static inline int
snd_ctl_add_slave_uncached(struct snd_kcontrol *master, snd_ctl_add_follower_uncached(struct snd_kcontrol *master,
struct snd_kcontrol *slave) struct snd_kcontrol *follower)
{ {
return _snd_ctl_add_slave(master, slave, SND_CTL_SLAVE_NEED_UPDATE); return _snd_ctl_add_follower(master, follower, SND_CTL_FOLLOWER_NEED_UPDATE);
} }
int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl, int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl,
...@@ -246,11 +247,11 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl, ...@@ -246,11 +247,11 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl,
void *private_data); void *private_data);
void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only); void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
#define snd_ctl_sync_vmaster_hook(kctl) snd_ctl_sync_vmaster(kctl, true) #define snd_ctl_sync_vmaster_hook(kctl) snd_ctl_sync_vmaster(kctl, true)
int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl, int snd_ctl_apply_vmaster_followers(struct snd_kcontrol *kctl,
int (*func)(struct snd_kcontrol *vslave, int (*func)(struct snd_kcontrol *vfollower,
struct snd_kcontrol *slave, struct snd_kcontrol *follower,
void *arg), void *arg),
void *arg); void *arg);
/* /*
* Helper functions for jack-detection controls * Helper functions for jack-detection controls
......
include/sound/hda_codec.h
View file @ 9ab0cb30
...@@ -208,7 +208,7 @@ struct hda_codec { ...@@ -208,7 +208,7 @@ struct hda_codec {
struct mutex control_mutex; struct mutex control_mutex;
struct snd_array spdif_out; struct snd_array spdif_out;
unsigned int spdif_in_enable; /* SPDIF input enable? */ unsigned int spdif_in_enable; /* SPDIF input enable? */
const hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */ const hda_nid_t *follower_dig_outs; /* optional digital out follower widgets */
struct snd_array init_pins; /* initial (BIOS) pin configurations */ struct snd_array init_pins; /* initial (BIOS) pin configurations */
struct snd_array driver_pins; /* pin configs set by codec parser */ struct snd_array driver_pins; /* pin configs set by codec parser */
struct snd_array cvt_setups; /* audio convert setups */ struct snd_array cvt_setups; /* audio convert setups */
......
sound/core/vmaster.c
View file @ 9ab0cb30
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Virtual master and slave controls * Virtual master and follower controls
* *
* Copyright (c) 2008 by Takashi Iwai <tiwai@suse.de> * Copyright (c) 2008 by Takashi Iwai <tiwai@suse.de>
*/ */
...@@ -21,15 +21,15 @@ struct link_ctl_info { ...@@ -21,15 +21,15 @@ struct link_ctl_info {
}; };
/* /*
* link master - this contains a list of slave controls that are * link master - this contains a list of follower controls that are
* identical types, i.e. info returns the same value type and value * identical types, i.e. info returns the same value type and value
* ranges, but may have different number of counts. * ranges, but may have different number of counts.
* *
* The master control is so far only mono volume/switch for simplicity. * The master control is so far only mono volume/switch for simplicity.
* The same value will be applied to all slaves. * The same value will be applied to all followers.
*/ */
struct link_master { struct link_master {
struct list_head slaves; struct list_head followers;
struct link_ctl_info info; struct link_ctl_info info;
int val; /* the master value */ int val; /* the master value */
unsigned int tlv[4]; unsigned int tlv[4];
...@@ -38,23 +38,23 @@ struct link_master { ...@@ -38,23 +38,23 @@ struct link_master {
}; };
/* /*
* link slave - this contains a slave control element * link follower - this contains a follower control element
* *
* It fakes the control callbacsk with additional attenuation by the * It fakes the control callbacks with additional attenuation by the
* master control. A slave may have either one or two channels. * master control. A follower may have either one or two channels.
*/ */
struct link_slave { struct link_follower {
struct list_head list; struct list_head list;
struct link_master *master; struct link_master *master;
struct link_ctl_info info; struct link_ctl_info info;
int vals[2]; /* current values */ int vals[2]; /* current values */
unsigned int flags; unsigned int flags;
struct snd_kcontrol *kctl; /* original kcontrol pointer */ struct snd_kcontrol *kctl; /* original kcontrol pointer */
struct snd_kcontrol slave; /* the copy of original control entry */ struct snd_kcontrol follower; /* the copy of original control entry */
}; };
static int slave_update(struct link_slave *slave) static int follower_update(struct link_follower *follower)
{ {
struct snd_ctl_elem_value *uctl; struct snd_ctl_elem_value *uctl;
int err, ch; int err, ch;
...@@ -62,68 +62,68 @@ static int slave_update(struct link_slave *slave) ...@@ -62,68 +62,68 @@ static int slave_update(struct link_slave *slave)
uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
if (!uctl) if (!uctl)
return -ENOMEM; return -ENOMEM;
uctl->id = slave->slave.id; uctl->id = follower->follower.id;
err = slave->slave.get(&slave->slave, uctl); err = follower->follower.get(&follower->follower, uctl);
if (err < 0) if (err < 0)
goto error; goto error;
for (ch = 0; ch < slave->info.count; ch++) for (ch = 0; ch < follower->info.count; ch++)
slave->vals[ch] = uctl->value.integer.value[ch]; follower->vals[ch] = uctl->value.integer.value[ch];
error: error:
kfree(uctl); kfree(uctl);
return err < 0 ? err : 0; return err < 0 ? err : 0;
} }
/* get the slave ctl info and save the initial values */ /* get the follower ctl info and save the initial values */
static int slave_init(struct link_slave *slave) static int follower_init(struct link_follower *follower)
{ {
struct snd_ctl_elem_info *uinfo; struct snd_ctl_elem_info *uinfo;
int err; int err;
if (slave->info.count) { if (follower->info.count) {
/* already initialized */ /* already initialized */
if (slave->flags & SND_CTL_SLAVE_NEED_UPDATE) if (follower->flags & SND_CTL_FOLLOWER_NEED_UPDATE)
return slave_update(slave); return follower_update(follower);
return 0; return 0;
} }
uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL); uinfo = kmalloc(sizeof(*uinfo), GFP_KERNEL);
if (!uinfo) if (!uinfo)
return -ENOMEM; return -ENOMEM;
uinfo->id = slave->slave.id; uinfo->id = follower->follower.id;
err = slave->slave.info(&slave->slave, uinfo); err = follower->follower.info(&follower->follower, uinfo);
if (err < 0) { if (err < 0) {
kfree(uinfo); kfree(uinfo);
return err; return err;
} }
slave->info.type = uinfo->type; follower->info.type = uinfo->type;
slave->info.count = uinfo->count; follower->info.count = uinfo->count;
if (slave->info.count > 2 || if (follower->info.count > 2 ||
(slave->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER && (follower->info.type != SNDRV_CTL_ELEM_TYPE_INTEGER &&
slave->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) { follower->info.type != SNDRV_CTL_ELEM_TYPE_BOOLEAN)) {
pr_err("ALSA: vmaster: invalid slave element\n"); pr_err("ALSA: vmaster: invalid follower element\n");
kfree(uinfo); kfree(uinfo);
return -EINVAL; return -EINVAL;
} }
slave->info.min_val = uinfo->value.integer.min; follower->info.min_val = uinfo->value.integer.min;
slave->info.max_val = uinfo->value.integer.max; follower->info.max_val = uinfo->value.integer.max;
kfree(uinfo); kfree(uinfo);
return slave_update(slave); return follower_update(follower);
} }
/* initialize master volume */ /* initialize master volume */
static int master_init(struct link_master *master) static int master_init(struct link_master *master)
{ {
struct link_slave *slave; struct link_follower *follower;
if (master->info.count) if (master->info.count)
return 0; /* already initialized */ return 0; /* already initialized */
list_for_each_entry(slave, &master->slaves, list) { list_for_each_entry(follower, &master->followers, list) {
int err = slave_init(slave); int err = follower_init(follower);
if (err < 0) if (err < 0)
return err; return err;
master->info = slave->info; master->info = follower->info;
master->info.count = 1; /* always mono */ master->info.count = 1; /* always mono */
/* set full volume as default (= no attenuation) */ /* set full volume as default (= no attenuation) */
master->val = master->info.max_val; master->val = master->info.max_val;
...@@ -134,113 +134,113 @@ static int master_init(struct link_master *master) ...@@ -134,113 +134,113 @@ static int master_init(struct link_master *master)
return -ENOENT; return -ENOENT;
} }
static int slave_get_val(struct link_slave *slave, static int follower_get_val(struct link_follower *follower,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int err, ch; int err, ch;
err = slave_init(slave); err = follower_init(follower);
if (err < 0) if (err < 0)
return err; return err;
for (ch = 0; ch < slave->info.count; ch++) for (ch = 0; ch < follower->info.count; ch++)
ucontrol->value.integer.value[ch] = slave->vals[ch]; ucontrol->value.integer.value[ch] = follower->vals[ch];
return 0; return 0;
} }
static int slave_put_val(struct link_slave *slave, static int follower_put_val(struct link_follower *follower,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int err, ch, vol; int err, ch, vol;
err = master_init(slave->master); err = master_init(follower->master);
if (err < 0) if (err < 0)
return err; return err;
switch (slave->info.type) { switch (follower->info.type) {
case SNDRV_CTL_ELEM_TYPE_BOOLEAN: case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
for (ch = 0; ch < slave->info.count; ch++) for (ch = 0; ch < follower->info.count; ch++)
ucontrol->value.integer.value[ch] &= ucontrol->value.integer.value[ch] &=
!!slave->master->val; !!follower->master->val;
break; break;
case SNDRV_CTL_ELEM_TYPE_INTEGER: case SNDRV_CTL_ELEM_TYPE_INTEGER:
for (ch = 0; ch < slave->info.count; ch++) { for (ch = 0; ch < follower->info.count; ch++) {
/* max master volume is supposed to be 0 dB */ /* max master volume is supposed to be 0 dB */
vol = ucontrol->value.integer.value[ch]; vol = ucontrol->value.integer.value[ch];
vol += slave->master->val - slave->master->info.max_val; vol += follower->master->val - follower->master->info.max_val;
if (vol < slave->info.min_val) if (vol < follower->info.min_val)
vol = slave->info.min_val; vol = follower->info.min_val;
else if (vol > slave->info.max_val) else if (vol > follower->info.max_val)
vol = slave->info.max_val; vol = follower->info.max_val;
ucontrol->value.integer.value[ch] = vol; ucontrol->value.integer.value[ch] = vol;
} }
break; break;
} }
return slave->slave.put(&slave->slave, ucontrol); return follower->follower.put(&follower->follower, ucontrol);
} }
/* /*
* ctl callbacks for slaves * ctl callbacks for followers
*/ */
static int slave_info(struct snd_kcontrol *kcontrol, static int follower_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
struct link_slave *slave = snd_kcontrol_chip(kcontrol); struct link_follower *follower = snd_kcontrol_chip(kcontrol);
return slave->slave.info(&slave->slave, uinfo); return follower->follower.info(&follower->follower, uinfo);
} }
static int slave_get(struct snd_kcontrol *kcontrol, static int follower_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct link_slave *slave = snd_kcontrol_chip(kcontrol); struct link_follower *follower = snd_kcontrol_chip(kcontrol);
return slave_get_val(slave, ucontrol); return follower_get_val(follower, ucontrol);
} }
static int slave_put(struct snd_kcontrol *kcontrol, static int follower_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct link_slave *slave = snd_kcontrol_chip(kcontrol); struct link_follower *follower = snd_kcontrol_chip(kcontrol);
int err, ch, changed = 0; int err, ch, changed = 0;
err = slave_init(slave); err = follower_init(follower);
if (err < 0) if (err < 0)
return err; return err;
for (ch = 0; ch < slave->info.count; ch++) { for (ch = 0; ch < follower->info.count; ch++) {
if (slave->vals[ch] != ucontrol->value.integer.value[ch]) { if (follower->vals[ch] != ucontrol->value.integer.value[ch]) {
changed = 1; changed = 1;
slave->vals[ch] = ucontrol->value.integer.value[ch]; follower->vals[ch] = ucontrol->value.integer.value[ch];
} }
} }
if (!changed) if (!changed)
return 0; return 0;
err = slave_put_val(slave, ucontrol); err = follower_put_val(follower, ucontrol);
if (err < 0) if (err < 0)
return err; return err;
return 1; return 1;
} }
static int slave_tlv_cmd(struct snd_kcontrol *kcontrol, static int follower_tlv_cmd(struct snd_kcontrol *kcontrol,
int op_flag, unsigned int size, int op_flag, unsigned int size,
unsigned int __user *tlv) unsigned int __user *tlv)
{ {
struct link_slave *slave = snd_kcontrol_chip(kcontrol); struct link_follower *follower = snd_kcontrol_chip(kcontrol);
/* FIXME: this assumes that the max volume is 0 dB */ /* FIXME: this assumes that the max volume is 0 dB */
return slave->slave.tlv.c(&slave->slave, op_flag, size, tlv); return follower->follower.tlv.c(&follower->follower, op_flag, size, tlv);
} }
static void slave_free(struct snd_kcontrol *kcontrol) static void follower_free(struct snd_kcontrol *kcontrol)
{ {
struct link_slave *slave = snd_kcontrol_chip(kcontrol); struct link_follower *follower = snd_kcontrol_chip(kcontrol);
if (slave->slave.private_free) if (follower->follower.private_free)
slave->slave.private_free(&slave->slave); follower->follower.private_free(&follower->follower);
if (slave->master) if (follower->master)
list_del(&slave->list); list_del(&follower->list);
kfree(slave); kfree(follower);
} }
/* /*
* Add a slave control to the group with the given master control * Add a follower control to the group with the given master control
* *
* All slaves must be the same type (returning the same information * All followers must be the same type (returning the same information
* via info callback). The function doesn't check it, so it's your * via info callback). The function doesn't check it, so it's your
* responsibility. * responsibility.
* *
...@@ -249,35 +249,36 @@ static void slave_free(struct snd_kcontrol *kcontrol) ...@@ -249,35 +249,36 @@ static void slave_free(struct snd_kcontrol *kcontrol)
* - logarithmic volume control (dB level), no linear volume * - logarithmic volume control (dB level), no linear volume
* - master can only attenuate the volume, no gain * - master can only attenuate the volume, no gain
*/ */
int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave, int _snd_ctl_add_follower(struct snd_kcontrol *master,
unsigned int flags) struct snd_kcontrol *follower,
unsigned int flags)
{ {
struct link_master *master_link = snd_kcontrol_chip(master); struct link_master *master_link = snd_kcontrol_chip(master);
struct link_slave *srec; struct link_follower *srec;
srec = kzalloc(struct_size(srec, slave.vd, slave->count), srec = kzalloc(struct_size(srec, follower.vd, follower->count),
GFP_KERNEL); GFP_KERNEL);
if (!srec) if (!srec)
return -ENOMEM; return -ENOMEM;
srec->kctl = slave; srec->kctl = follower;
srec->slave = *slave; srec->follower = *follower;
memcpy(srec->slave.vd, slave->vd, slave->count * sizeof(*slave->vd)); memcpy(srec->follower.vd, follower->vd, follower->count * sizeof(*follower->vd));
srec->master = master_link; srec->master = master_link;
srec->flags = flags; srec->flags = flags;
/* override callbacks */ /* override callbacks */
slave->info = slave_info; follower->info = follower_info;
slave->get = slave_get; follower->get = follower_get;
slave->put = slave_put; follower->put = follower_put;
if (slave->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) if (follower->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK)
slave->tlv.c = slave_tlv_cmd; follower->tlv.c = follower_tlv_cmd;
slave->private_data = srec; follower->private_data = srec;
slave->private_free = slave_free; follower->private_free = follower_free;
list_add_tail(&srec->list, &master_link->slaves); list_add_tail(&srec->list, &master_link->followers);
return 0; return 0;
} }
EXPORT_SYMBOL(_snd_ctl_add_slave); EXPORT_SYMBOL(_snd_ctl_add_follower);
/* /*
* ctl callbacks for master controls * ctl callbacks for master controls
...@@ -309,20 +310,20 @@ static int master_get(struct snd_kcontrol *kcontrol, ...@@ -309,20 +310,20 @@ static int master_get(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static int sync_slaves(struct link_master *master, int old_val, int new_val) static int sync_followers(struct link_master *master, int old_val, int new_val)
{ {
struct link_slave *slave; struct link_follower *follower;
struct snd_ctl_elem_value *uval; struct snd_ctl_elem_value *uval;
uval = kmalloc(sizeof(*uval), GFP_KERNEL); uval = kmalloc(sizeof(*uval), GFP_KERNEL);
if (!uval) if (!uval)
return -ENOMEM; return -ENOMEM;
list_for_each_entry(slave, &master->slaves, list) { list_for_each_entry(follower, &master->followers, list) {
master->val = old_val; master->val = old_val;
uval->id = slave->slave.id; uval->id = follower->follower.id;
slave_get_val(slave, uval); follower_get_val(follower, uval);
master->val = new_val; master->val = new_val;
slave_put_val(slave, uval); follower_put_val(follower, uval);
} }
kfree(uval); kfree(uval);
return 0; return 0;
...@@ -344,7 +345,7 @@ static int master_put(struct snd_kcontrol *kcontrol, ...@@ -344,7 +345,7 @@ static int master_put(struct snd_kcontrol *kcontrol,
if (new_val == old_val) if (new_val == old_val)
return 0; return 0;
err = sync_slaves(master, old_val, new_val); err = sync_followers(master, old_val, new_val);
if (err < 0) if (err < 0)
return err; return err;
if (master->hook && !first_init) if (master->hook && !first_init)
...@@ -355,17 +356,17 @@ static int master_put(struct snd_kcontrol *kcontrol, ...@@ -355,17 +356,17 @@ static int master_put(struct snd_kcontrol *kcontrol,
static void master_free(struct snd_kcontrol *kcontrol) static void master_free(struct snd_kcontrol *kcontrol)
{ {
struct link_master *master = snd_kcontrol_chip(kcontrol); struct link_master *master = snd_kcontrol_chip(kcontrol);
struct link_slave *slave, *n; struct link_follower *follower, *n;
/* free all slave links and retore the original slave kctls */ /* free all follower links and retore the original follower kctls */
list_for_each_entry_safe(slave, n, &master->slaves, list) { list_for_each_entry_safe(follower, n, &master->followers, list) {
struct snd_kcontrol *sctl = slave->kctl; struct snd_kcontrol *sctl = follower->kctl;
struct list_head olist = sctl->list; struct list_head olist = sctl->list;
memcpy(sctl, &slave->slave, sizeof(*sctl)); memcpy(sctl, &follower->follower, sizeof(*sctl));
memcpy(sctl->vd, slave->slave.vd, memcpy(sctl->vd, follower->follower.vd,
sctl->count * sizeof(*sctl->vd)); sctl->count * sizeof(*sctl->vd));
sctl->list = olist; /* keep the current linked-list */ sctl->list = olist; /* keep the current linked-list */
kfree(slave); kfree(follower);
} }
kfree(master); kfree(master);
} }
...@@ -378,8 +379,8 @@ static void master_free(struct snd_kcontrol *kcontrol) ...@@ -378,8 +379,8 @@ static void master_free(struct snd_kcontrol *kcontrol)
* *
* Creates a virtual master control with the given name string. * Creates a virtual master control with the given name string.
* *
* After creating a vmaster element, you can add the slave controls * After creating a vmaster element, you can add the follower controls
* via snd_ctl_add_slave() or snd_ctl_add_slave_uncached(). * via snd_ctl_add_follower() or snd_ctl_add_follower_uncached().
* *
* The optional argument @tlv can be used to specify the TLV information * The optional argument @tlv can be used to specify the TLV information
* for dB scale of the master control. It should be a single element * for dB scale of the master control. It should be a single element
...@@ -403,7 +404,7 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name, ...@@ -403,7 +404,7 @@ struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
master = kzalloc(sizeof(*master), GFP_KERNEL); master = kzalloc(sizeof(*master), GFP_KERNEL);
if (!master) if (!master)
return NULL; return NULL;
INIT_LIST_HEAD(&master->slaves); INIT_LIST_HEAD(&master->followers);
kctl = snd_ctl_new1(&knew, master); kctl = snd_ctl_new1(&knew, master);
if (!kctl) { if (!kctl) {
...@@ -455,11 +456,11 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kcontrol, ...@@ -455,11 +456,11 @@ int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kcontrol,
EXPORT_SYMBOL_GPL(snd_ctl_add_vmaster_hook); EXPORT_SYMBOL_GPL(snd_ctl_add_vmaster_hook);
/** /**
* snd_ctl_sync_vmaster - Sync the vmaster slaves and hook * snd_ctl_sync_vmaster - Sync the vmaster followers and hook
* @kcontrol: vmaster kctl element * @kcontrol: vmaster kctl element
* @hook_only: sync only the hook * @hook_only: sync only the hook
* *
* Forcibly call the put callback of each slave and call the hook function * Forcibly call the put callback of each follower and call the hook function
* to synchronize with the current value of the given vmaster element. * to synchronize with the current value of the given vmaster element.
* NOP when NULL is passed to @kcontrol. * NOP when NULL is passed to @kcontrol.
*/ */
...@@ -476,7 +477,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only) ...@@ -476,7 +477,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only)
if (err < 0) if (err < 0)
return; return;
first_init = err; first_init = err;
err = sync_slaves(master, master->val, master->val); err = sync_followers(master, master->val, master->val);
if (err < 0) if (err < 0)
return; return;
} }
...@@ -487,34 +488,34 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only) ...@@ -487,34 +488,34 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kcontrol, bool hook_only)
EXPORT_SYMBOL_GPL(snd_ctl_sync_vmaster); EXPORT_SYMBOL_GPL(snd_ctl_sync_vmaster);
/** /**
* snd_ctl_apply_vmaster_slaves - Apply function to each vmaster slave * snd_ctl_apply_vmaster_followers - Apply function to each vmaster follower
* @kctl: vmaster kctl element * @kctl: vmaster kctl element
* @func: function to apply * @func: function to apply
* @arg: optional function argument * @arg: optional function argument
* *
* Apply the function @func to each slave kctl of the given vmaster kctl. * Apply the function @func to each follower kctl of the given vmaster kctl.
* Returns 0 if successful, or a negative error code. * Returns 0 if successful, or a negative error code.
*/ */
int snd_ctl_apply_vmaster_slaves(struct snd_kcontrol *kctl, int snd_ctl_apply_vmaster_followers(struct snd_kcontrol *kctl,
int (*func)(struct snd_kcontrol *vslave, int (*func)(struct snd_kcontrol *vfollower,
struct snd_kcontrol *slave, struct snd_kcontrol *follower,
void *arg), void *arg),
void *arg) void *arg)
{ {
struct link_master *master; struct link_master *master;
struct link_slave *slave; struct link_follower *follower;
int err; int err;
master = snd_kcontrol_chip(kctl); master = snd_kcontrol_chip(kctl);
err = master_init(master); err = master_init(master);
if (err < 0) if (err < 0)
return err; return err;
list_for_each_entry(slave, &master->slaves, list) { list_for_each_entry(follower, &master->followers, list) {
err = func(slave->kctl, &slave->slave, arg); err = func(follower->kctl, &follower->follower, arg);
if (err < 0) if (err < 0)
return err; return err;
} }
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(snd_ctl_apply_vmaster_slaves); EXPORT_SYMBOL_GPL(snd_ctl_apply_vmaster_followers);
sound/pci/ac97/ac97_patch.c
View file @ 9ab0cb30
...@@ -19,7 +19,7 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, ...@@ -19,7 +19,7 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
const char *name); const char *name);
static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
const unsigned int *tlv, const unsigned int *tlv,
const char * const *slaves); const char * const *followers);
/* /*
* Chip specific initialization * Chip specific initialization
...@@ -3373,7 +3373,7 @@ AC97_SINGLE("Downmix LFE and Center to Front", 0x5a, 12, 1, 0), ...@@ -3373,7 +3373,7 @@ AC97_SINGLE("Downmix LFE and Center to Front", 0x5a, 12, 1, 0),
AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0), AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0),
}; };
static const char * const slave_vols_vt1616[] = { static const char * const follower_vols_vt1616[] = {
"Front Playback Volume", "Front Playback Volume",
"Surround Playback Volume", "Surround Playback Volume",
"Center Playback Volume", "Center Playback Volume",
...@@ -3381,7 +3381,7 @@ static const char * const slave_vols_vt1616[] = { ...@@ -3381,7 +3381,7 @@ static const char * const slave_vols_vt1616[] = {
NULL NULL
}; };
static const char * const slave_sws_vt1616[] = { static const char * const follower_sws_vt1616[] = {
"Front Playback Switch", "Front Playback Switch",
"Surround Playback Switch", "Surround Playback Switch",
"Center Playback Switch", "Center Playback Switch",
...@@ -3400,10 +3400,10 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, ...@@ -3400,10 +3400,10 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
return snd_ctl_find_id(ac97->bus->card, &id); return snd_ctl_find_id(ac97->bus->card, &id);
} }
/* create a virtual master control and add slaves */ /* create a virtual master control and add followers */
static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
const unsigned int *tlv, const unsigned int *tlv,
const char * const *slaves) const char * const *followers)
{ {
struct snd_kcontrol *kctl; struct snd_kcontrol *kctl;
const char * const *s; const char * const *s;
...@@ -3416,16 +3416,16 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, ...@@ -3416,16 +3416,16 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
if (err < 0) if (err < 0)
return err; return err;
for (s = slaves; *s; s++) { for (s = followers; *s; s++) {
struct snd_kcontrol *sctl; struct snd_kcontrol *sctl;
sctl = snd_ac97_find_mixer_ctl(ac97, *s); sctl = snd_ac97_find_mixer_ctl(ac97, *s);
if (!sctl) { if (!sctl) {
dev_dbg(ac97->bus->card->dev, dev_dbg(ac97->bus->card->dev,
"Cannot find slave %s, skipped\n", *s); "Cannot find follower %s, skipped\n", *s);
continue; continue;
} }
err = snd_ctl_add_slave(kctl, sctl); err = snd_ctl_add_follower(kctl, sctl);
if (err < 0) if (err < 0)
return err; return err;
} }
...@@ -3451,12 +3451,12 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97) ...@@ -3451,12 +3451,12 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Front Playback"); snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Front Playback");
err = snd_ac97_add_vmaster(ac97, "Master Playback Volume", err = snd_ac97_add_vmaster(ac97, "Master Playback Volume",
kctl->tlv.p, slave_vols_vt1616); kctl->tlv.p, follower_vols_vt1616);
if (err < 0) if (err < 0)
return err; return err;
err = snd_ac97_add_vmaster(ac97, "Master Playback Switch", err = snd_ac97_add_vmaster(ac97, "Master Playback Switch",
NULL, slave_sws_vt1616); NULL, follower_sws_vt1616);
if (err < 0) if (err < 0)
return err; return err;
......
sound/pci/ca0106/ca0106_mixer.c
View file @ 9ab0cb30
...@@ -739,7 +739,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst) ...@@ -739,7 +739,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst)
static static
DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1); DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1);
static const char * const slave_vols[] = { static const char * const follower_vols[] = {
"Analog Front Playback Volume", "Analog Front Playback Volume",
"Analog Rear Playback Volume", "Analog Rear Playback Volume",
"Analog Center/LFE Playback Volume", "Analog Center/LFE Playback Volume",
...@@ -752,7 +752,7 @@ static const char * const slave_vols[] = { ...@@ -752,7 +752,7 @@ static const char * const slave_vols[] = {
NULL NULL
}; };
static const char * const slave_sws[] = { static const char * const follower_sws[] = {
"Analog Front Playback Switch", "Analog Front Playback Switch",
"Analog Rear Playback Switch", "Analog Rear Playback Switch",
"Analog Center/LFE Playback Switch", "Analog Center/LFE Playback Switch",
...@@ -761,13 +761,13 @@ static const char * const slave_sws[] = { ...@@ -761,13 +761,13 @@ static const char * const slave_sws[] = {
NULL NULL
}; };
static void add_slaves(struct snd_card *card, static void add_followers(struct snd_card *card,
struct snd_kcontrol *master, const char * const *list) struct snd_kcontrol *master, const char * const *list)
{ {
for (; *list; list++) { for (; *list; list++) {
struct snd_kcontrol *slave = ctl_find(card, *list); struct snd_kcontrol *follower = ctl_find(card, *list);
if (slave) if (follower)
snd_ctl_add_slave(master, slave); snd_ctl_add_follower(master, follower);
} }
} }
...@@ -852,7 +852,7 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu) ...@@ -852,7 +852,7 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu)
err = snd_ctl_add(card, vmaster); err = snd_ctl_add(card, vmaster);
if (err < 0) if (err < 0)
return err; return err;
add_slaves(card, vmaster, slave_vols); add_followers(card, vmaster, follower_vols);
if (emu->details->spi_dac) { if (emu->details->spi_dac) {
vmaster = snd_ctl_make_virtual_master("Master Playback Switch", vmaster = snd_ctl_make_virtual_master("Master Playback Switch",
...@@ -862,7 +862,7 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu) ...@@ -862,7 +862,7 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu)
err = snd_ctl_add(card, vmaster); err = snd_ctl_add(card, vmaster);
if (err < 0) if (err < 0)
return err; return err;
add_slaves(card, vmaster, slave_sws); add_followers(card, vmaster, follower_sws);
} }
strcpy(card->mixername, "CA0106"); strcpy(card->mixername, "CA0106");
......
sound/pci/hda/hda_codec.c
View file @ 9ab0cb30
...@@ -785,7 +785,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec) ...@@ -785,7 +785,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)
snd_array_free(&codec->spdif_out); snd_array_free(&codec->spdif_out);
snd_array_free(&codec->verbs); snd_array_free(&codec->verbs);
codec->preset = NULL; codec->preset = NULL;
codec->slave_dig_outs = NULL; codec->follower_dig_outs = NULL;
codec->spdif_status_reset = 0; codec->spdif_status_reset = 0;
snd_array_free(&codec->mixers); snd_array_free(&codec->mixers);
snd_array_free(&codec->nids); snd_array_free(&codec->nids);
...@@ -1806,11 +1806,11 @@ int snd_hda_codec_reset(struct hda_codec *codec) ...@@ -1806,11 +1806,11 @@ int snd_hda_codec_reset(struct hda_codec *codec)
return 0; return 0;
} }
typedef int (*map_slave_func_t)(struct hda_codec *, void *, struct snd_kcontrol *); typedef int (*map_follower_func_t)(struct hda_codec *, void *, struct snd_kcontrol *);
/* apply the function to all matching slave ctls in the mixer list */ /* apply the function to all matching follower ctls in the mixer list */
static int map_slaves(struct hda_codec *codec, const char * const *slaves, static int map_followers(struct hda_codec *codec, const char * const *followers,
const char *suffix, map_slave_func_t func, void *data) const char *suffix, map_follower_func_t func, void *data)
{ {
struct hda_nid_item *items; struct hda_nid_item *items;
const char * const *s; const char * const *s;
...@@ -1821,7 +1821,7 @@ static int map_slaves(struct hda_codec *codec, const char * const *slaves, ...@@ -1821,7 +1821,7 @@ static int map_slaves(struct hda_codec *codec, const char * const *slaves,
struct snd_kcontrol *sctl = items[i].kctl; struct snd_kcontrol *sctl = items[i].kctl;
if (!sctl || sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER) if (!sctl || sctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER)
continue; continue;
for (s = slaves; *s; s++) { for (s = followers; *s; s++) {
char tmpname[sizeof(sctl->id.name)]; char tmpname[sizeof(sctl->id.name)];
const char *name = *s; const char *name = *s;
if (suffix) { if (suffix) {
...@@ -1840,8 +1840,8 @@ static int map_slaves(struct hda_codec *codec, const char * const *slaves, ...@@ -1840,8 +1840,8 @@ static int map_slaves(struct hda_codec *codec, const char * const *slaves,
return 0; return 0;
} }
static int check_slave_present(struct hda_codec *codec, static int check_follower_present(struct hda_codec *codec,
void *data, struct snd_kcontrol *sctl) void *data, struct snd_kcontrol *sctl)
{ {
return 1; return 1;
} }
...@@ -1860,17 +1860,17 @@ static int put_kctl_with_value(struct snd_kcontrol *kctl, int val) ...@@ -1860,17 +1860,17 @@ static int put_kctl_with_value(struct snd_kcontrol *kctl, int val)
return 0; return 0;
} }
struct slave_init_arg { struct follower_init_arg {
struct hda_codec *codec; struct hda_codec *codec;
int step; int step;
}; };
/* initialize the slave volume with 0dB via snd_ctl_apply_vmaster_slaves() */ /* initialize the follower volume with 0dB via snd_ctl_apply_vmaster_followers() */
static int init_slave_0dB(struct snd_kcontrol *slave, static int init_follower_0dB(struct snd_kcontrol *follower,
struct snd_kcontrol *kctl, struct snd_kcontrol *kctl,
void *_arg) void *_arg)
{ {
struct slave_init_arg *arg = _arg; struct follower_init_arg *arg = _arg;
int _tlv[4]; int _tlv[4];
const int *tlv = NULL; const int *tlv = NULL;
int step; int step;
...@@ -1879,7 +1879,7 @@ static int init_slave_0dB(struct snd_kcontrol *slave, ...@@ -1879,7 +1879,7 @@ static int init_slave_0dB(struct snd_kcontrol *slave,
if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
if (kctl->tlv.c != snd_hda_mixer_amp_tlv) { if (kctl->tlv.c != snd_hda_mixer_amp_tlv) {
codec_err(arg->codec, codec_err(arg->codec,
"Unexpected TLV callback for slave %s:%d\n", "Unexpected TLV callback for follower %s:%d\n",
kctl->id.name, kctl->id.index); kctl->id.name, kctl->id.index);
return 0; /* ignore */ return 0; /* ignore */
} }
...@@ -1897,7 +1897,7 @@ static int init_slave_0dB(struct snd_kcontrol *slave, ...@@ -1897,7 +1897,7 @@ static int init_slave_0dB(struct snd_kcontrol *slave,
return 0; return 0;
if (arg->step && arg->step != step) { if (arg->step && arg->step != step) {
codec_err(arg->codec, codec_err(arg->codec,
"Mismatching dB step for vmaster slave (%d!=%d)\n", "Mismatching dB step for vmaster follower (%d!=%d)\n",
arg->step, step); arg->step, step);
return 0; return 0;
} }
...@@ -1905,49 +1905,49 @@ static int init_slave_0dB(struct snd_kcontrol *slave, ...@@ -1905,49 +1905,49 @@ static int init_slave_0dB(struct snd_kcontrol *slave,
arg->step = step; arg->step = step;
val = -tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] / step; val = -tlv[SNDRV_CTL_TLVO_DB_SCALE_MIN] / step;
if (val > 0) { if (val > 0) {
put_kctl_with_value(slave, val); put_kctl_with_value(follower, val);
return val; return val;
} }
return 0; return 0;
} }
/* unmute the slave via snd_ctl_apply_vmaster_slaves() */ /* unmute the follower via snd_ctl_apply_vmaster_followers() */
static int init_slave_unmute(struct snd_kcontrol *slave, static int init_follower_unmute(struct snd_kcontrol *follower,
struct snd_kcontrol *kctl, struct snd_kcontrol *kctl,
void *_arg) void *_arg)
{ {
return put_kctl_with_value(slave, 1); return put_kctl_with_value(follower, 1);
} }
static int add_slave(struct hda_codec *codec, static int add_follower(struct hda_codec *codec,
void *data, struct snd_kcontrol *slave) void *data, struct snd_kcontrol *follower)
{ {
return snd_ctl_add_slave(data, slave); return snd_ctl_add_follower(data, follower);
} }
/** /**
* __snd_hda_add_vmaster - create a virtual master control and add slaves * __snd_hda_add_vmaster - create a virtual master control and add followers
* @codec: HD-audio codec * @codec: HD-audio codec
* @name: vmaster control name * @name: vmaster control name
* @tlv: TLV data (optional) * @tlv: TLV data (optional)
* @slaves: slave control names (optional) * @followers: follower control names (optional)
* @suffix: suffix string to each slave name (optional) * @suffix: suffix string to each follower name (optional)
* @init_slave_vol: initialize slaves to unmute/0dB * @init_follower_vol: initialize followers to unmute/0dB
* @ctl_ret: store the vmaster kcontrol in return * @ctl_ret: store the vmaster kcontrol in return
* *
* Create a virtual master control with the given name. The TLV data * Create a virtual master control with the given name. The TLV data
* must be either NULL or a valid data. * must be either NULL or a valid data.
* *
* @slaves is a NULL-terminated array of strings, each of which is a * @followers is a NULL-terminated array of strings, each of which is a
* slave control name. All controls with these names are assigned to * follower control name. All controls with these names are assigned to
* the new virtual master control. * the new virtual master control.
* *
* This function returns zero if successful or a negative error code. * This function returns zero if successful or a negative error code.
*/ */
int __snd_hda_add_vmaster(struct hda_codec *codec, char *name, int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
unsigned int *tlv, const char * const *slaves, unsigned int *tlv, const char * const *followers,
const char *suffix, bool init_slave_vol, const char *suffix, bool init_follower_vol,
struct snd_kcontrol **ctl_ret) struct snd_kcontrol **ctl_ret)
{ {
struct snd_kcontrol *kctl; struct snd_kcontrol *kctl;
...@@ -1956,9 +1956,9 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name, ...@@ -1956,9 +1956,9 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
if (ctl_ret) if (ctl_ret)
*ctl_ret = NULL; *ctl_ret = NULL;
err = map_slaves(codec, slaves, suffix, check_slave_present, NULL); err = map_followers(codec, followers, suffix, check_follower_present, NULL);
if (err != 1) { if (err != 1) {
codec_dbg(codec, "No slave found for %s\n", name); codec_dbg(codec, "No follower found for %s\n", name);
return 0; return 0;
} }
kctl = snd_ctl_make_virtual_master(name, tlv); kctl = snd_ctl_make_virtual_master(name, tlv);
...@@ -1968,20 +1968,20 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name, ...@@ -1968,20 +1968,20 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
if (err < 0) if (err < 0)
return err; return err;
err = map_slaves(codec, slaves, suffix, add_slave, kctl); err = map_followers(codec, followers, suffix, add_follower, kctl);
if (err < 0) if (err < 0)
return err; return err;
/* init with master mute & zero volume */ /* init with master mute & zero volume */
put_kctl_with_value(kctl, 0); put_kctl_with_value(kctl, 0);
if (init_slave_vol) { if (init_follower_vol) {
struct slave_init_arg arg = { struct follower_init_arg arg = {
.codec = codec, .codec = codec,
.step = 0, .step = 0,
}; };
snd_ctl_apply_vmaster_slaves(kctl, snd_ctl_apply_vmaster_followers(kctl,
tlv ? init_slave_0dB : init_slave_unmute, tlv ? init_follower_0dB : init_follower_unmute,
&arg); &arg);
} }
if (ctl_ret) if (ctl_ret)
...@@ -2284,7 +2284,7 @@ static unsigned int convert_to_spdif_status(unsigned short val) ...@@ -2284,7 +2284,7 @@ static unsigned int convert_to_spdif_status(unsigned short val)
return sbits; return sbits;
} }
/* set digital convert verbs both for the given NID and its slaves */ /* set digital convert verbs both for the given NID and its followers */
static void set_dig_out(struct hda_codec *codec, hda_nid_t nid, static void set_dig_out(struct hda_codec *codec, hda_nid_t nid,
int mask, int val) int mask, int val)
{ {
...@@ -2292,7 +2292,7 @@ static void set_dig_out(struct hda_codec *codec, hda_nid_t nid, ...@@ -2292,7 +2292,7 @@ static void set_dig_out(struct hda_codec *codec, hda_nid_t nid,
snd_hdac_regmap_update(&codec->core, nid, AC_VERB_SET_DIGI_CONVERT_1, snd_hdac_regmap_update(&codec->core, nid, AC_VERB_SET_DIGI_CONVERT_1,
mask, val); mask, val);
d = codec->slave_dig_outs; d = codec->follower_dig_outs;
if (!d) if (!d)
return; return;
for (; *d; d++) for (; *d; d++)
...@@ -3580,9 +3580,9 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid, ...@@ -3580,9 +3580,9 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
spdif->ctls & ~AC_DIG1_ENABLE & 0xff, spdif->ctls & ~AC_DIG1_ENABLE & 0xff,
-1); -1);
snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format); snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);
if (codec->slave_dig_outs) { if (codec->follower_dig_outs) {
const hda_nid_t *d; const hda_nid_t *d;
for (d = codec->slave_dig_outs; *d; d++) for (d = codec->follower_dig_outs; *d; d++)
snd_hda_codec_setup_stream(codec, *d, stream_tag, 0, snd_hda_codec_setup_stream(codec, *d, stream_tag, 0,
format); format);
} }
...@@ -3595,9 +3595,9 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid, ...@@ -3595,9 +3595,9 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid) static void cleanup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid)
{ {
snd_hda_codec_cleanup_stream(codec, nid); snd_hda_codec_cleanup_stream(codec, nid);
if (codec->slave_dig_outs) { if (codec->follower_dig_outs) {
const hda_nid_t *d; const hda_nid_t *d;
for (d = codec->slave_dig_outs; *d; d++) for (d = codec->follower_dig_outs; *d; d++)
snd_hda_codec_cleanup_stream(codec, *d); snd_hda_codec_cleanup_stream(codec, *d);
} }
} }
...@@ -3679,7 +3679,7 @@ EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_close); ...@@ -3679,7 +3679,7 @@ EXPORT_SYMBOL_GPL(snd_hda_multi_out_dig_close);
* @hinfo: PCM information to assign * @hinfo: PCM information to assign
* *
* Open analog outputs and set up the hw-constraints. * Open analog outputs and set up the hw-constraints.
* If the digital outputs can be opened as slave, open the digital * If the digital outputs can be opened as follower, open the digital
* outputs, too. * outputs, too.
*/ */
int snd_hda_multi_out_analog_open(struct hda_codec *codec, int snd_hda_multi_out_analog_open(struct hda_codec *codec,
......
sound/pci/hda/hda_generic.c
View file @ 9ab0cb30
...@@ -4112,7 +4112,7 @@ static void parse_digital(struct hda_codec *codec) ...@@ -4112,7 +4112,7 @@ static void parse_digital(struct hda_codec *codec)
int i, nums; int i, nums;
hda_nid_t dig_nid, pin; hda_nid_t dig_nid, pin;
/* support multiple SPDIFs; the secondary is set up as a slave */ /* support multiple SPDIFs; the secondary is set up as a follower */
nums = 0; nums = 0;
for (i = 0; i < spec->autocfg.dig_outs; i++) { for (i = 0; i < spec->autocfg.dig_outs; i++) {
pin = spec->autocfg.dig_out_pins[i]; pin = spec->autocfg.dig_out_pins[i];
...@@ -4131,10 +4131,10 @@ static void parse_digital(struct hda_codec *codec) ...@@ -4131,10 +4131,10 @@ static void parse_digital(struct hda_codec *codec)
spec->multiout.dig_out_nid = dig_nid; spec->multiout.dig_out_nid = dig_nid;
spec->dig_out_type = spec->autocfg.dig_out_type[0]; spec->dig_out_type = spec->autocfg.dig_out_type[0];
} else { } else {
spec->multiout.slave_dig_outs = spec->slave_dig_outs; spec->multiout.follower_dig_outs = spec->follower_dig_outs;
if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1) if (nums >= ARRAY_SIZE(spec->follower_dig_outs) - 1)
break; break;
spec->slave_dig_outs[nums - 1] = dig_nid; spec->follower_dig_outs[nums - 1] = dig_nid;
} }
nums++; nums++;
} }
...@@ -4589,7 +4589,7 @@ static void call_update_outputs(struct hda_codec *codec) ...@@ -4589,7 +4589,7 @@ static void call_update_outputs(struct hda_codec *codec)
else else
snd_hda_gen_update_outputs(codec); snd_hda_gen_update_outputs(codec);
/* sync the whole vmaster slaves to reflect the new auto-mute status */ /* sync the whole vmaster followers to reflect the new auto-mute status */
if (spec->auto_mute_via_amp && !codec->bus->shutdown) if (spec->auto_mute_via_amp && !codec->bus->shutdown)
snd_ctl_sync_vmaster(spec->vmaster_mute.sw_kctl, false); snd_ctl_sync_vmaster(spec->vmaster_mute.sw_kctl, false);
} }
...@@ -5233,8 +5233,8 @@ EXPORT_SYMBOL_GPL(snd_hda_gen_parse_auto_config); ...@@ -5233,8 +5233,8 @@ EXPORT_SYMBOL_GPL(snd_hda_gen_parse_auto_config);
* Build control elements * Build control elements
*/ */
/* slave controls for virtual master */ /* follower controls for virtual master */
static const char * const slave_pfxs[] = { static const char * const follower_pfxs[] = {
"Front", "Surround", "Center", "LFE", "Side", "Front", "Surround", "Center", "LFE", "Side",
"Headphone", "Speaker", "Mono", "Line Out", "Headphone", "Speaker", "Mono", "Line Out",
"CLFE", "Bass Speaker", "PCM", "CLFE", "Bass Speaker", "PCM",
...@@ -5286,7 +5286,7 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) ...@@ -5286,7 +5286,7 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
if (!spec->no_analog && !spec->suppress_vmaster && if (!spec->no_analog && !spec->suppress_vmaster &&
!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { !snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
err = snd_hda_add_vmaster(codec, "Master Playback Volume", err = snd_hda_add_vmaster(codec, "Master Playback Volume",
spec->vmaster_tlv, slave_pfxs, spec->vmaster_tlv, follower_pfxs,
"Playback Volume"); "Playback Volume");
if (err < 0) if (err < 0)
return err; return err;
...@@ -5294,7 +5294,7 @@ int snd_hda_gen_build_controls(struct hda_codec *codec) ...@@ -5294,7 +5294,7 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
if (!spec->no_analog && !spec->suppress_vmaster && if (!spec->no_analog && !spec->suppress_vmaster &&
!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) { !snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) {
err = __snd_hda_add_vmaster(codec, "Master Playback Switch", err = __snd_hda_add_vmaster(codec, "Master Playback Switch",
NULL, slave_pfxs, NULL, follower_pfxs,
"Playback Switch", "Playback Switch",
true, &spec->vmaster_mute.sw_kctl); true, &spec->vmaster_mute.sw_kctl);
if (err < 0) if (err < 0)
...@@ -5809,7 +5809,7 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) ...@@ -5809,7 +5809,7 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec)
spec->stream_name_digital); spec->stream_name_digital);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
codec->slave_dig_outs = spec->multiout.slave_dig_outs; codec->follower_dig_outs = spec->multiout.follower_dig_outs;
spec->pcm_rec[1] = info; spec->pcm_rec[1] = info;
if (spec->dig_out_type) if (spec->dig_out_type)
info->pcm_type = spec->dig_out_type; info->pcm_type = spec->dig_out_type;
......
sound/pci/hda/hda_generic.h
View file @ 9ab0cb30
...@@ -116,7 +116,7 @@ struct hda_gen_spec { ...@@ -116,7 +116,7 @@ struct hda_gen_spec {
* dig_out_nid and hp_nid are optional * dig_out_nid and hp_nid are optional
*/ */
hda_nid_t alt_dac_nid; hda_nid_t alt_dac_nid;
hda_nid_t slave_dig_outs[3]; /* optional - for auto-parsing */ hda_nid_t follower_dig_outs[3]; /* optional - for auto-parsing */
int dig_out_type; int dig_out_type;
/* capture */ /* capture */
......
sound/pci/hda/hda_local.h
View file @ 9ab0cb30
...@@ -129,11 +129,11 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir, ...@@ -129,11 +129,11 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
const char *name); const char *name);
int __snd_hda_add_vmaster(struct hda_codec *codec, char *name, int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
unsigned int *tlv, const char * const *slaves, unsigned int *tlv, const char * const *followers,
const char *suffix, bool init_slave_vol, const char *suffix, bool init_follower_vol,
struct snd_kcontrol **ctl_ret); struct snd_kcontrol **ctl_ret);
#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \ #define snd_hda_add_vmaster(codec, name, tlv, followers, suffix) \
__snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true, NULL) __snd_hda_add_vmaster(codec, name, tlv, followers, suffix, true, NULL)
int snd_hda_codec_reset(struct hda_codec *codec); int snd_hda_codec_reset(struct hda_codec *codec);
void snd_hda_codec_register(struct hda_codec *codec); void snd_hda_codec_register(struct hda_codec *codec);
void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec); void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec);
...@@ -216,7 +216,7 @@ struct hda_multi_out { ...@@ -216,7 +216,7 @@ struct hda_multi_out {
hda_nid_t hp_out_nid[HDA_MAX_OUTS]; /* DACs for multiple HPs */ hda_nid_t hp_out_nid[HDA_MAX_OUTS]; /* DACs for multiple HPs */
hda_nid_t extra_out_nid[HDA_MAX_OUTS]; /* other (e.g. speaker) DACs */ hda_nid_t extra_out_nid[HDA_MAX_OUTS]; /* other (e.g. speaker) DACs */
hda_nid_t dig_out_nid; /* digital out audio widget */ hda_nid_t dig_out_nid; /* digital out audio widget */
const hda_nid_t *slave_dig_outs; const hda_nid_t *follower_dig_outs;
int max_channels; /* currently supported analog channels */ int max_channels; /* currently supported analog channels */
int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */ int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */
int no_share_stream; /* don't share a stream with multiple pins */ int no_share_stream; /* don't share a stream with multiple pins */
......
sound/pci/hda/patch_ca0132.c
View file @ 9ab0cb30
...@@ -6245,10 +6245,10 @@ static int zxr_add_headphone_gain_switch(struct hda_codec *codec) ...@@ -6245,10 +6245,10 @@ static int zxr_add_headphone_gain_switch(struct hda_codec *codec)
} }
/* /*
* Need to create slave controls for the alternate codecs that have surround * Need to create follower controls for the alternate codecs that have surround
* capabilities. * capabilities.
*/ */
static const char * const ca0132_alt_slave_pfxs[] = { static const char * const ca0132_alt_follower_pfxs[] = {
"Front", "Surround", "Center", "LFE", NULL, "Front", "Surround", "Center", "LFE", NULL,
}; };
...@@ -6376,15 +6376,15 @@ static int ca0132_build_controls(struct hda_codec *codec) ...@@ -6376,15 +6376,15 @@ static int ca0132_build_controls(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
} }
/* Setup vmaster with surround slaves for desktop ca0132 devices */ /* Setup vmaster with surround followers for desktop ca0132 devices */
if (ca0132_use_alt_functions(spec)) { if (ca0132_use_alt_functions(spec)) {
snd_hda_set_vmaster_tlv(codec, spec->dacs[0], HDA_OUTPUT, snd_hda_set_vmaster_tlv(codec, spec->dacs[0], HDA_OUTPUT,
spec->tlv); spec->tlv);
snd_hda_add_vmaster(codec, "Master Playback Volume", snd_hda_add_vmaster(codec, "Master Playback Volume",
spec->tlv, ca0132_alt_slave_pfxs, spec->tlv, ca0132_alt_follower_pfxs,
"Playback Volume"); "Playback Volume");
err = __snd_hda_add_vmaster(codec, "Master Playback Switch", err = __snd_hda_add_vmaster(codec, "Master Playback Switch",
NULL, ca0132_alt_slave_pfxs, NULL, ca0132_alt_follower_pfxs,
"Playback Switch", "Playback Switch",
true, &spec->vmaster_mute.sw_kctl); true, &spec->vmaster_mute.sw_kctl);
if (err < 0) if (err < 0)
......
sound/pci/hda/patch_sigmatel.c
View file @ 9ab0cb30
...@@ -3135,7 +3135,7 @@ static void fixup_hp_headphone(struct hda_codec *codec, hda_nid_t pin) ...@@ -3135,7 +3135,7 @@ static void fixup_hp_headphone(struct hda_codec *codec, hda_nid_t pin)
unsigned int pin_cfg = snd_hda_codec_get_pincfg(codec, pin); unsigned int pin_cfg = snd_hda_codec_get_pincfg(codec, pin);
/* It was changed in the BIOS to just satisfy MS DTM. /* It was changed in the BIOS to just satisfy MS DTM.
* Lets turn it back into slaved HP * Lets turn it back into follower HP
*/ */
pin_cfg = (pin_cfg & (~AC_DEFCFG_DEVICE)) | pin_cfg = (pin_cfg & (~AC_DEFCFG_DEVICE)) |
(AC_JACK_HP_OUT << AC_DEFCFG_DEVICE_SHIFT); (AC_JACK_HP_OUT << AC_DEFCFG_DEVICE_SHIFT);
......
sound/pci/ice1712/juli.c
View file @ 9ab0cb30
...@@ -397,7 +397,7 @@ static const struct snd_kcontrol_new juli_mute_controls[] = { ...@@ -397,7 +397,7 @@ static const struct snd_kcontrol_new juli_mute_controls[] = {
}, },
}; };
static const char * const slave_vols[] = { static const char * const follower_vols[] = {
PCM_VOLUME, PCM_VOLUME,
MONITOR_AN_IN_VOLUME, MONITOR_AN_IN_VOLUME,
MONITOR_DIG_IN_VOLUME, MONITOR_DIG_IN_VOLUME,
...@@ -418,16 +418,16 @@ static struct snd_kcontrol *ctl_find(struct snd_card *card, ...@@ -418,16 +418,16 @@ static struct snd_kcontrol *ctl_find(struct snd_card *card,
return snd_ctl_find_id(card, &sid); return snd_ctl_find_id(card, &sid);
} }
static void add_slaves(struct snd_card *card, static void add_followers(struct snd_card *card,
struct snd_kcontrol *master, struct snd_kcontrol *master,
const char * const *list) const char * const *list)
{ {
for (; *list; list++) { for (; *list; list++) {
struct snd_kcontrol *slave = ctl_find(card, *list); struct snd_kcontrol *follower = ctl_find(card, *list);
/* dev_dbg(card->dev, "add_slaves - %s\n", *list); */ /* dev_dbg(card->dev, "add_followers - %s\n", *list); */
if (slave) { if (follower) {
/* dev_dbg(card->dev, "slave %s found\n", *list); */ /* dev_dbg(card->dev, "follower %s found\n", *list); */
snd_ctl_add_slave(master, slave); snd_ctl_add_follower(master, follower);
} }
} }
} }
...@@ -454,7 +454,7 @@ static int juli_add_controls(struct snd_ice1712 *ice) ...@@ -454,7 +454,7 @@ static int juli_add_controls(struct snd_ice1712 *ice)
juli_master_db_scale); juli_master_db_scale);
if (!vmaster) if (!vmaster)
return -ENOMEM; return -ENOMEM;
add_slaves(ice->card, vmaster, slave_vols); add_followers(ice->card, vmaster, follower_vols);
err = snd_ctl_add(ice->card, vmaster); err = snd_ctl_add(ice->card, vmaster);
if (err < 0) if (err < 0)
return err; return err;
......
sound/pci/ice1712/quartet.c
View file @ 9ab0cb30
...@@ -757,7 +757,7 @@ static const struct snd_kcontrol_new qtet_controls[] = { ...@@ -757,7 +757,7 @@ static const struct snd_kcontrol_new qtet_controls[] = {
QTET_CONTROL("Output 3/4 to Monitor 1/2", sw, OUT34_MON12), QTET_CONTROL("Output 3/4 to Monitor 1/2", sw, OUT34_MON12),
}; };
static const char * const slave_vols[] = { static const char * const follower_vols[] = {
PCM_12_PLAYBACK_VOLUME, PCM_12_PLAYBACK_VOLUME,
PCM_34_PLAYBACK_VOLUME, PCM_34_PLAYBACK_VOLUME,
NULL NULL
...@@ -776,13 +776,13 @@ static struct snd_kcontrol *ctl_find(struct snd_card *card, ...@@ -776,13 +776,13 @@ static struct snd_kcontrol *ctl_find(struct snd_card *card,
return snd_ctl_find_id(card, &sid); return snd_ctl_find_id(card, &sid);
} }
static void add_slaves(struct snd_card *card, static void add_followers(struct snd_card *card,
struct snd_kcontrol *master, const char * const *list) struct snd_kcontrol *master, const char * const *list)
{ {
for (; *list; list++) { for (; *list; list++) {
struct snd_kcontrol *slave = ctl_find(card, *list); struct snd_kcontrol *follower = ctl_find(card, *list);
if (slave) if (follower)
snd_ctl_add_slave(master, slave); snd_ctl_add_follower(master, follower);
} }
} }
...@@ -806,7 +806,7 @@ static int qtet_add_controls(struct snd_ice1712 *ice) ...@@ -806,7 +806,7 @@ static int qtet_add_controls(struct snd_ice1712 *ice)
qtet_master_db_scale); qtet_master_db_scale);
if (!vmaster) if (!vmaster)
return -ENOMEM; return -ENOMEM;
add_slaves(ice->card, vmaster, slave_vols); add_followers(ice->card, vmaster, follower_vols);
err = snd_ctl_add(ice->card, vmaster); err = snd_ctl_add(ice->card, vmaster);
if (err < 0) if (err < 0)
return err; return err;
......
sound/ppc/awacs.c
View file @ 9ab0cb30
...@@ -1063,12 +1063,12 @@ snd_pmac_awacs_init(struct snd_pmac *chip) ...@@ -1063,12 +1063,12 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
if (pm5500 || imac || lombard) { if (pm5500 || imac || lombard) {
vmaster_sw = snd_ctl_make_virtual_master( vmaster_sw = snd_ctl_make_virtual_master(
"Master Playback Switch", (unsigned int *) NULL); "Master Playback Switch", (unsigned int *) NULL);
err = snd_ctl_add_slave_uncached(vmaster_sw, err = snd_ctl_add_follower_uncached(vmaster_sw,
chip->master_sw_ctl); chip->master_sw_ctl);
if (err < 0) if (err < 0)
return err; return err;
err = snd_ctl_add_slave_uncached(vmaster_sw, err = snd_ctl_add_follower_uncached(vmaster_sw,
chip->speaker_sw_ctl); chip->speaker_sw_ctl);
if (err < 0) if (err < 0)
return err; return err;
err = snd_ctl_add(chip->card, vmaster_sw); err = snd_ctl_add(chip->card, vmaster_sw);
...@@ -1076,10 +1076,10 @@ snd_pmac_awacs_init(struct snd_pmac *chip) ...@@ -1076,10 +1076,10 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
return err; return err;
vmaster_vol = snd_ctl_make_virtual_master( vmaster_vol = snd_ctl_make_virtual_master(
"Master Playback Volume", (unsigned int *) NULL); "Master Playback Volume", (unsigned int *) NULL);
err = snd_ctl_add_slave(vmaster_vol, master_vol); err = snd_ctl_add_follower(vmaster_vol, master_vol);
if (err < 0) if (err < 0)
return err; return err;
err = snd_ctl_add_slave(vmaster_vol, speaker_vol); err = snd_ctl_add_follower(vmaster_vol, speaker_vol);
if (err < 0) if (err < 0)
return err; return err;
err = snd_ctl_add(chip->card, vmaster_vol); err = snd_ctl_add(chip->card, vmaster_vol);
......
sound/usb/6fire/control.c
View file @ 9ab0cb30
...@@ -539,7 +539,7 @@ static int usb6fire_control_add_virtual( ...@@ -539,7 +539,7 @@ static int usb6fire_control_add_virtual(
ret = snd_ctl_add(card, control); ret = snd_ctl_add(card, control);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = snd_ctl_add_slave(vmaster, control); ret = snd_ctl_add_follower(vmaster, control);
if (ret < 0) if (ret < 0)
return ret; return ret;
i++; i++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7