diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:43:03 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:43:28 +0300 |
commit | 651a88798412e216f337d70181127e847f00a4b7 (patch) | |
tree | 5fefb107fa9b3fa74dcc3e7ce410c5a1d571549d /sound/pci/hda/patch_realtek.c | |
parent | 1b6a6fc5280e97559287b61eade2d4b363e836f2 (diff) | |
parent | bb06c203f86766fc2c37cbce0e20e9daae786f6e (diff) | |
download | linux-651a88798412e216f337d70181127e847f00a4b7.tar.xz |
Merge branch 'topic/cs35l41' into for-next
Pull CS35L41 codec updates
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index aace474a899d..4e12af24b4d3 100644 --- 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) |