ASoC: tlv320aic32x4-i2c: Simplify probe()

Simplify probe() by replacing of_match_node() and i2c_match_id() with
i2c_get_match_data().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230831194622.87653-3-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c
index 713f3f63b5e3ba1f013e1da12439650044f055b7..b27b5ae1e4b20b6bddf5808596bbbaa45dda03aa 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4-i2c.c
+++ b/sound/soc/codecs/tlv320aic32x4-i2c.c
@@ -16,9 +16,6 @@
 
 #include "tlv320aic32x4.h"
 
-static const struct of_device_id aic32x4_of_id[];
-static const struct i2c_device_id aic32x4_i2c_id[];
-
 static int aic32x4_i2c_probe(struct i2c_client *i2c)
 {
        struct regmap *regmap;
@@ -30,18 +27,7 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c)
        config.val_bits = 8;
 
        regmap = devm_regmap_init_i2c(i2c, &config);
-
-       if (i2c->dev.of_node) {
-               const struct of_device_id *oid;
-
-               oid = of_match_node(aic32x4_of_id, i2c->dev.of_node);
-               type = (uintptr_t)oid->data;
-       } else {
-               const struct i2c_device_id *id;
-
-               id = i2c_match_id(aic32x4_i2c_id, i2c);
-               type = id->driver_data;
-       }
+       type = (uintptr_t)i2c_get_match_data(i2c);
 
        return aic32x4_probe(&i2c->dev, regmap, type);
 }