ALSA: hda/cs35l56: Reject I2C alias addresses

The ACPI nodes for CS35L56 can contain an extra I2CSerialBusV2 that
is not a real device, it is an alias address.

This alias address will not be in the cirrus,dev-index array, so reject
any instantions with a device address not found in the array.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230731165726.7940-10-rf@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index 004740509dbd32981ae6284cc1b1ed5b77867948..76b9c685560bf078ec856843f0db1f42969c7508 100644 (file)
--- a/sound/pci/hda/cs35l56_hda.c
+++ b/sound/pci/hda/cs35l56_hda.c
@@ -852,8 +852,12 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id)
                        break;
                }
        }
+       /*
+        * It's not an error for the ID to be missing: for I2C there can be
+        * an alias address that is not a real device. So reject silently.
+        */
        if (cs35l56->index == -1) {
-               dev_err(cs35l56->base.dev, "No index found in %s\n", property);
+               dev_dbg(cs35l56->base.dev, "No index found in %s\n", property);
                ret = -ENODEV;
                goto err;
        }
@@ -891,7 +895,8 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id)
        return 0;
 
 err:
-       dev_err(cs35l56->base.dev, "Failed property %s: %d\n", property, ret);
+       if (ret != -ENODEV)
+               dev_err(cs35l56->base.dev, "Failed property %s: %d\n", property, ret);
 
        return ret;
 }
@@ -904,10 +909,8 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int id)
        dev_set_drvdata(cs35l56->base.dev, cs35l56);
 
        ret = cs35l56_hda_read_acpi(cs35l56, id);
-       if (ret) {
-               dev_err_probe(cs35l56->base.dev, ret, "Platform not supported\n");
+       if (ret)
                goto err;
-       }
 
        cs35l56->amp_name = devm_kasprintf(cs35l56->base.dev, GFP_KERNEL, "AMP%d",
                                           cs35l56->index + 1);