ALSA: ice1712: Simplify with snd_ctl_find_id_mixer()

Replace an open code with the new snd_ctl_find_id_mixer().
There is no functional change.

Also, add the missing NULL checks in psc724_set_jack_state() to deal
with error cases.

Link: https://lore.kernel.org/r/20230720082108.31346-7-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index f0f8324..d80ecf1 100644 (file)
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -408,22 +408,13 @@ static const char * const follower_vols[] = {
 static
 DECLARE_TLV_DB_SCALE(juli_master_db_scale, -6350, 50, 1);
 
-static struct snd_kcontrol *ctl_find(struct snd_card *card,
-                                    const char *name)
-{
-       struct snd_ctl_elem_id sid = {0};
-
-       strscpy(sid.name, name, sizeof(sid.name));
-       sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       return snd_ctl_find_id(card, &sid);
-}
-
 static void add_followers(struct snd_card *card,
                          struct snd_kcontrol *master,
                          const char * const *list)
 {
        for (; *list; list++) {
-               struct snd_kcontrol *follower = ctl_find(card, *list);
+               struct snd_kcontrol *follower =
+                       snd_ctl_find_id_mixer(card, *list);
                /* dev_dbg(card->dev, "add_followers - %s\n", *list); */
                if (follower) {
                        /* dev_dbg(card->dev, "follower %s found\n", *list); */

diff --git a/sound/pci/ice1712/psc724.c b/sound/pci/ice1712/psc724.c
index 82cf365..0818e42 100644 (file)
--- a/sound/pci/ice1712/psc724.c
+++ b/sound/pci/ice1712/psc724.c
@@ -177,7 +177,6 @@ static bool psc724_get_master_switch(struct snd_ice1712 *ice)
 static void psc724_set_jack_state(struct snd_ice1712 *ice, bool hp_connected)
 {
        struct psc724_spec *spec = ice->spec;
-       struct snd_ctl_elem_id elem_id;
        struct snd_kcontrol *kctl;
        u16 power = spec->wm8776.regs[WM8776_REG_PWRDOWN] & ~WM8776_PWR_HPPD;
 
@@ -187,17 +186,15 @@ static void psc724_set_jack_state(struct snd_ice1712 *ice, bool hp_connected)
        snd_wm8776_set_power(&spec->wm8776, power);
        spec->hp_connected = hp_connected;
        /* notify about master speaker mute change */
-       memset(&elem_id, 0, sizeof(elem_id));
-       elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       strscpy(elem_id.name, "Master Speakers Playback Switch",
-                                               sizeof(elem_id.name));
-       kctl = snd_ctl_find_id(ice->card, &elem_id);
-       snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
+       kctl = snd_ctl_find_id_mixer(ice->card,
+                                    "Master Speakers Playback Switch");
+       if (kctl)
+               snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
        /* and headphone mute change */
-       strscpy(elem_id.name, spec->wm8776.ctl[WM8776_CTL_HP_SW].name,
-                                               sizeof(elem_id.name));
-       kctl = snd_ctl_find_id(ice->card, &elem_id);
-       snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
+       kctl = snd_ctl_find_id_mixer(ice->card,
+                                    spec->wm8776.ctl[WM8776_CTL_HP_SW].name);
+       if (kctl)
+               snd_ctl_notify(ice->card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
 }
 
 static void psc724_update_hp_jack_state(struct work_struct *work)

diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c
index 20b3e8f..9450c4b 100644 (file)
--- a/sound/pci/ice1712/quartet.c
+++ b/sound/pci/ice1712/quartet.c
@@ -766,21 +766,12 @@ static const char * const follower_vols[] = {
 static
 DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1);
 
-static struct snd_kcontrol *ctl_find(struct snd_card *card,
-                                    const char *name)
-{
-       struct snd_ctl_elem_id sid = {0};
-
-       strscpy(sid.name, name, sizeof(sid.name));
-       sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       return snd_ctl_find_id(card, &sid);
-}
-
 static void add_followers(struct snd_card *card,
                          struct snd_kcontrol *master, const char * const *list)
 {
        for (; *list; list++) {
-               struct snd_kcontrol *follower = ctl_find(card, *list);
+               struct snd_kcontrol *follower =
+                       snd_ctl_find_id_mixer(card, *list);
                if (follower)
                        snd_ctl_add_follower(master, follower);
        }

diff --git a/sound/pci/ice1712/wm8776.c b/sound/pci/ice1712/wm8776.c
index 6eda861..4934256 100644 (file)
--- a/sound/pci/ice1712/wm8776.c
+++ b/sound/pci/ice1712/wm8776.c
@@ -34,13 +34,9 @@ static void snd_wm8776_activate_ctl(struct snd_wm8776 *wm,
        struct snd_card *card = wm->card;
        struct snd_kcontrol *kctl;
        struct snd_kcontrol_volatile *vd;
-       struct snd_ctl_elem_id elem_id;
        unsigned int index_offset;
 
-       memset(&elem_id, 0, sizeof(elem_id));
-       strscpy(elem_id.name, ctl_name, sizeof(elem_id.name));
-       elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       kctl = snd_ctl_find_id(card, &elem_id);
+       kctl = snd_ctl_find_id_mixer(card, ctl_name);
        if (!kctl)
                return;
        index_offset = snd_ctl_get_ioff(kctl, &kctl->id);