summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYisheng Xie <xieyisheng1@huawei.com>2018-05-31 07:11:20 -0400
committerTakashi Iwai <tiwai@suse.de>2018-05-31 13:42:48 -0400
commit9ee92f5355f8264de20c8337823aff918c717aee (patch)
treebd3722e3ad66f9a09446c78221e919d82166600e
parent0d5bcfc9974ad8ce0fc77a95a53ab704faa0dfb7 (diff)
ALSA: oxygen: use match_string() helper
match_string() returns the index of an array for a matching string, which can be used instead of open coded variant. Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/oxygen/oxygen_mixer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 4ca12665ff73..81af21ac1439 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -1052,10 +1052,10 @@ static int add_controls(struct oxygen *chip,
1052 [CONTROL_CD_CAPTURE_SWITCH] = "CD Capture Switch", 1052 [CONTROL_CD_CAPTURE_SWITCH] = "CD Capture Switch",
1053 [CONTROL_AUX_CAPTURE_SWITCH] = "Aux Capture Switch", 1053 [CONTROL_AUX_CAPTURE_SWITCH] = "Aux Capture Switch",
1054 }; 1054 };
1055 unsigned int i, j; 1055 unsigned int i;
1056 struct snd_kcontrol_new template; 1056 struct snd_kcontrol_new template;
1057 struct snd_kcontrol *ctl; 1057 struct snd_kcontrol *ctl;
1058 int err; 1058 int j, err;
1059 1059
1060 for (i = 0; i < count; ++i) { 1060 for (i = 0; i < count; ++i) {
1061 template = controls[i]; 1061 template = controls[i];
@@ -1086,11 +1086,11 @@ static int add_controls(struct oxygen *chip,
1086 err = snd_ctl_add(chip->card, ctl); 1086 err = snd_ctl_add(chip->card, ctl);
1087 if (err < 0) 1087 if (err < 0)
1088 return err; 1088 return err;
1089 for (j = 0; j < CONTROL_COUNT; ++j) 1089 j = match_string(known_ctl_names, CONTROL_COUNT, ctl->id.name);
1090 if (!strcmp(ctl->id.name, known_ctl_names[j])) { 1090 if (j >= 0) {
1091 chip->controls[j] = ctl; 1091 chip->controls[j] = ctl;
1092 ctl->private_free = oxygen_any_ctl_free; 1092 ctl->private_free = oxygen_any_ctl_free;
1093 } 1093 }
1094 } 1094 }
1095 return 0; 1095 return 0;
1096} 1096}