ASoC: ak4642: Simplify probe()

Simpilfy probe() by replacing of_device_get_match_data() and id lookup for
retrieving match data by i2c_get_match_data().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230831204734.104954-3-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 901014909c0f089ec6dea6cb9d67f2684665a756..8a40c6b3f4d8e1c5bf980bba23e061097fc952b0 100644 (file)
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -628,32 +628,21 @@ static struct clk *ak4642_of_parse_mcko(struct device *dev)
 #define ak4642_of_parse_mcko(d) 0
 #endif
 
-static const struct of_device_id ak4642_of_match[];
-static const struct i2c_device_id ak4642_i2c_id[];
 static int ak4642_i2c_probe(struct i2c_client *i2c)
 {
        struct device *dev = &i2c->dev;
-       const struct ak4642_drvdata *drvdata = NULL;
+       const struct ak4642_drvdata *drvdata;
        struct regmap *regmap;
        struct ak4642_priv *priv;
        struct clk *mcko = NULL;
 
        if (dev_fwnode(dev)) {
-               const struct of_device_id *of_id;
-
                mcko = ak4642_of_parse_mcko(dev);
                if (IS_ERR(mcko))
                        mcko = NULL;
-
-               of_id = of_match_device(ak4642_of_match, dev);
-               if (of_id)
-                       drvdata = of_id->data;
-       } else {
-               const struct i2c_device_id *id =
-                       i2c_match_id(ak4642_i2c_id, i2c);
-               drvdata = (const struct ak4642_drvdata *)id->driver_data;
        }
 
+       drvdata = i2c_get_match_data(i2c);
        if (!drvdata)
                return dev_err_probe(dev, -EINVAL, "Unknown device type\n");