diff options
| author | Biju Das <biju.das.jz@bp.renesas.com> | 2023-08-27 10:15:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-11 01:30:05 +0100 |
| commit | e17e892dc8d1404a758d38ec870e44299f97d227 (patch) | |
| tree | 22b591ee1f3a542663ecfe2ff94fbf4f28f31088 /sound/soc/codecs/tas571x.c | |
| parent | c3c9b17d27887f7b2f6b85d0a364b009b8436539 (diff) | |
ASoC: tas571x: Simplify probe()
Simplify probe() by replacing of_match_device->i2c_get_match_data().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230827091525.39263-1-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tas571x.c')
| -rw-r--r-- | sound/soc/codecs/tas571x.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c index 1756edb35961..a220342c3d77 100644 --- a/sound/soc/codecs/tas571x.c +++ b/sound/soc/codecs/tas571x.c @@ -829,14 +829,10 @@ static struct snd_soc_dai_driver tas571x_dai = { .ops = &tas571x_dai_ops, }; -static const struct of_device_id tas571x_of_match[] __maybe_unused; -static const struct i2c_device_id tas571x_i2c_id[]; - static int tas571x_i2c_probe(struct i2c_client *client) { struct tas571x_private *priv; struct device *dev = &client->dev; - const struct of_device_id *of_id; int i, ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -844,14 +840,7 @@ static int tas571x_i2c_probe(struct i2c_client *client) return -ENOMEM; i2c_set_clientdata(client, priv); - of_id = of_match_device(tas571x_of_match, dev); - if (of_id) - priv->chip = of_id->data; - else { - const struct i2c_device_id *id = - i2c_match_id(tas571x_i2c_id, client); - priv->chip = (void *) id->driver_data; - } + priv->chip = i2c_get_match_data(client); priv->mclk = devm_clk_get(dev, "mclk"); if (IS_ERR(priv->mclk) && PTR_ERR(priv->mclk) != -ENOENT) { |