diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-07-17 17:45:17 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-07-20 10:10:47 +0200 |
| commit | 9ab0cb309e7950a1649bffade985e7ccc7aaf675 (patch) | |
| tree | 208c764fb84e0f8319a285c5f7de4f6f5936ef79 /sound/usb | |
| parent | ALSA: asihpi: delete duplicated word (diff) | |
| download | linux-9ab0cb309e7950a1649bffade985e7ccc7aaf675.tar.xz linux-9ab0cb309e7950a1649bffade985e7ccc7aaf675.zip | |
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.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/6fire/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c index 20f34d2ace5f..9bd8dcbb68e4 100644 --- a/sound/usb/6fire/control.c +++ b/sound/usb/6fire/control.c @@ -539,7 +539,7 @@ static int usb6fire_control_add_virtual( ret = snd_ctl_add(card, control); if (ret < 0) return ret; - ret = snd_ctl_add_slave(vmaster, control); + ret = snd_ctl_add_follower(vmaster, control); if (ret < 0) return ret; i++; |