diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2023-08-13 09:34:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-08-14 14:10:36 +0200 |
| commit | b39eee2754e9fbcbbdd866c1aad59575d8c4342e (patch) | |
| tree | fadd34b0ef914803fc62269bd1e4166491d405fa /sound/soc/codecs/ak4613.c | |
| parent | ASoC: soc-dai.h: remove unused call back functions (diff) | |
| download | linux-b39eee2754e9fbcbbdd866c1aad59575d8c4342e.tar.xz linux-b39eee2754e9fbcbbdd866c1aad59575d8c4342e.zip | |
ASoC: ak4613: Simplify probe()
Simpilfy probe() by replacing of_device_get_match_data() and id lookup for
retrieving match data by i2c_get_match_data().
While at it, drop unused local variable np from probe().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230813073458.59606-1-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/ak4613.c')
| -rw-r--r-- | sound/soc/codecs/ak4613.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index ad56caec9dac..619a817ee91c 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -880,20 +880,11 @@ static void ak4613_parse_of(struct ak4613_priv *priv, static int ak4613_i2c_probe(struct i2c_client *i2c) { struct device *dev = &i2c->dev; - struct device_node *np = dev->of_node; const struct regmap_config *regmap_cfg; struct regmap *regmap; struct ak4613_priv *priv; - regmap_cfg = NULL; - if (np) - regmap_cfg = of_device_get_match_data(dev); - else { - const struct i2c_device_id *id = - i2c_match_id(ak4613_i2c_id, i2c); - regmap_cfg = (const struct regmap_config *)id->driver_data; - } - + regmap_cfg = i2c_get_match_data(i2c); if (!regmap_cfg) return -EINVAL; |