[RFC V4 PATCH 02/19] ALSA: mixer_audient: explicitly define full control names

[Christian Ruppert <arc@gmx.li>]

Previously, control names were dynamically created depending if the
control was an input or an output, a volume or a switch. Get rid of this
logic by simply defining the full name in the control structure.

Signed-off-by: Christian Ruppert <arc@gmx.li>
Signed-off-by: Will Porter <mrwillporter@gmail.com>
---
 sound/usb/mixer_audient.c | 50 +++++++++++----------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/sound/usb/mixer_audient.c b/sound/usb/mixer_audient.c
index e2700b08cf80..2afef52a12d9 100644
--- a/sound/usb/mixer_audient.c
+++ b/sound/usb/mixer_audient.c
@@ -90,107 +90,92 @@ static const struct snd_audient_ctrl_type {
 	},
 };
 
-#define SND_AUDIENT_FLAGS_DIRECTION (1L<<0)
-#define SND_AUDIENT_FLAGS_CAPTURE (1L<<0)
-#define SND_AUDIENT_FLAGS_PLAYBACK (0L<<0)
 
 struct snd_audient_ctrl {
-	char *basename;
+	char *name;
 	enum snd_audient_type type;
 	unsigned int channels;
 	unsigned int hwchannels;
 	unsigned int val_offs;
-	unsigned long flags;
 };
 
 static const struct snd_audient_ctrl snd_audient_evo4_controls[] = {
 	{
-		.basename = "Master",
+		.name = "Master Playback Switch",
 		.type = SND_AUDIENT_TYPE_MUTE_OUT,
 		.channels = 1,
 		.hwchannels = 1,
 		.val_offs = 0,
-		.flags = SND_AUDIENT_FLAGS_PLAYBACK,
 	},
 	{
-		.basename = "Mic",
+		.name = "Mic Playback Switch",
 		.type = SND_AUDIENT_TYPE_MUTE,
 		.channels = 4,
 		.hwchannels = 2,
 		.val_offs = 0,
-		.flags = SND_AUDIENT_FLAGS_PLAYBACK,
 	},
 	{
-		.basename = "Monitor",
+		.name = "Monitor Playback Volume",
 		.type = SND_AUDIENT_TYPE_MONITOR,
 		.channels = 1,
 		.hwchannels = 1,
 		.val_offs = 0,
-		.flags = SND_AUDIENT_FLAGS_PLAYBACK,
 	},
 	{
-		.basename = "Mic 1",
+		.name = "Mic 1 Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 0,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Mic 2",
+		.name = "Mic 2 Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 2,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Master Left",
+		.name = "Master Left Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 4,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Master Right",
+		.name = "Master Right Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 6,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Loopback Left",
+		.name = "Loopback Left Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 8,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Loopback Right",
+		.name = "Loopback Right Capture Volume",
 		.type = SND_AUDIENT_TYPE_MIXER,
 		.channels = 2,
 		.hwchannels = 2,
 		.val_offs = 10,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Mic 1 Phantom",
+		.name = "Mic 1 Phantom Capture Switch",
 		.type = SND_AUDIENT_TYPE_PHANTOM,
 		.channels = 1,
 		.hwchannels = 1,
 		.val_offs = 0,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{
-		.basename = "Mic 2 Phantom",
+		.name = "Mic 2 Phantom Capture Switch",
 		.type = SND_AUDIENT_TYPE_PHANTOM,
 		.channels = 1,
 		.hwchannels = 1,
 		.val_offs = 1,
-		.flags = SND_AUDIENT_FLAGS_CAPTURE,
 	},
 	{ 0 }, /* sentinel */
 };
@@ -458,13 +443,12 @@ static int snd_audient_add_ctrl(struct usb_mixer_interface *mixer,
 {
 	const struct snd_audient_ctrl_type *ctype
 					= &snd_audient_ctypes[ctrl->type];
-	char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
 	struct snd_kcontrol_new knew = { 0 };
 	struct snd_kcontrol *kctl;
 	struct usb_mixer_elem_info *elem;
 
 	knew.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-	knew.name = name;
+	knew.name = ctrl->name;
 	knew.info = snd_ctl_audient_info;
 	knew.private_value = snd_audient_kctl_priv(ctrl->type, ctrl->val_offs,
 						   ctrl->hwchannels);
@@ -486,12 +470,6 @@ static int snd_audient_add_ctrl(struct usb_mixer_interface *mixer,
 		return -EINVAL;
 	}
 
-	snprintf(name, sizeof(name), "%s %s %s", ctrl->basename,
-		 ((ctrl->flags & SND_AUDIENT_FLAGS_DIRECTION)
-			== SND_AUDIENT_FLAGS_CAPTURE) ? "Capture" : "Playback",
-		 (ctype->type == SNDRV_CTL_ELEM_TYPE_BOOLEAN)
-			? "Switch" : "Volume");
-
 	elem = kzalloc_obj(*elem);
 	if (!elem)
 		return -ENOMEM;
@@ -524,7 +502,7 @@ int snd_audient_controls_create(struct usb_mixer_interface *mixer)
 	if (!info->controls)
 		return -ENODEV;
 
-	for (ctrl = info->controls; ctrl->basename; ctrl++) {
+	for (ctrl = info->controls; ctrl->name; ctrl++) {
 		const int ret = snd_audient_add_ctrl(mixer, ctrl);
 
 		if (ret < 0)
-- 
2.56.1