Merge tag 'sound-fix-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-block.git] / sound / pci / hda / patch_realtek.c

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index aace474a899de155e149c56ece00717cc1fa7683..4e12af24b4d35d3a58add1d4def14ac3425ad603 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6581,11 +6581,6 @@ static void alc287_fixup_legion_15imhg05_speakers(struct hda_codec *codec,
        }
 }
 
-static int comp_match_dev_name(struct device *dev, void *data)
-{
-       return strcmp(dev_name(dev), data) == 0;
-}
-
 static int find_comp_by_dev_name(struct alc_spec *spec, const char *name)
 {
        int i;
@@ -6646,7 +6641,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
                                              "%s-%s:00-cs35l41-hda.%d", bus, hid, i);
                        if (!name)
                                return;
-                       component_match_add(dev, &spec->match, comp_match_dev_name, name);
+                       component_match_add(dev, &spec->match, component_compare_dev_name, name);
                }
                ret = component_master_add_with_match(dev, &comp_master_ops, spec->match);
                if (ret)
@@ -6705,9 +6700,9 @@ static void alc287_fixup_legion_16achg6_speakers(struct hda_codec *cdc, const st
 
        switch (action) {
        case HDA_FIXUP_ACT_PRE_PROBE:
-               component_match_add(dev, &spec->match, comp_match_dev_name,
+               component_match_add(dev, &spec->match, component_compare_dev_name,
                                    "i2c-CLSA0100:00-cs35l41-hda.0");
-               component_match_add(dev, &spec->match, comp_match_dev_name,
+               component_match_add(dev, &spec->match, component_compare_dev_name,
                                    "i2c-CLSA0100:00-cs35l41-hda.1");
                ret = component_master_add_with_match(dev, &comp_master_ops, spec->match);
                if (ret)