| Message ID | 20230828191014.138310-3-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Match data improvements for tlv320aic32x4 driver | expand |
On Mon, Aug 28, 2023 at 08:10:14PM +0100, Biju Das wrote: > Simplify probe() by replacing of_match_node() and i2c_match_id() with > i2c_get_match_data(). Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> assuming that you finish this by converting SPI part as well.
Hi Andy Shevchenko, > Subject: Re: [PATCH v2 2/2] ASoC: tlv320aic32x4-i2c: Simplify probe() > > On Mon, Aug 28, 2023 at 08:10:14PM +0100, Biju Das wrote: > > Simplify probe() by replacing of_match_node() and i2c_match_id() with > > i2c_get_match_data(). > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > assuming that you finish this by converting SPI part as well. Sure. Cheers, Biju
diff --git a/sound/soc/codecs/tlv320aic32x4-i2c.c b/sound/soc/codecs/tlv320aic32x4-i2c.c index 713f3f63b5e3..b27b5ae1e4b2 100644 --- 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); }
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> --- v1->v2: * Return value of i2c_get_match_data() passed to type paramemter in aic32x4_probe(). --- sound/soc/codecs/tlv320aic32x4-i2c.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)