diff options
| author |  Biju Das <biju.das.jz@bp.renesas.com>
| 2023-08-31 20:46:22 +0100 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2023-09-11 01:18:59 +0100 |
| commit | c6d86149db94c0289b0e5950fa23c5b19031ab8d (patch) | |
| tree | 48c1392f78cbe7c16337b2aa94951cf525fa4083 | |
| parent | ASoC: tlv320aic32x4-i2c: Simplify probe() (diff) | |
| download | linux-c6d86149db94c0289b0e5950fa23c5b19031ab8d.tar.gz linux-c6d86149db94c0289b0e5950fa23c5b19031ab8d.tar.bz2 linux-c6d86149db94c0289b0e5950fa23c5b19031ab8d.zip | |
ASoC: tlv320aic32x4-spi: Simplify probe()
Simplify probe() by replacing of_match_node() and spi_get_device_id() with
spi_get_device_match_data().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230831194622.87653-4-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/tlv320aic32x4-spi.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sound/soc/codecs/tlv320aic32x4-spi.c b/sound/soc/codecs/tlv320aic32x4-spi.c index 81c05030dd3b..d5976c91766e 100644 --- a/sound/soc/codecs/tlv320aic32x4-spi.c +++ b/sound/soc/codecs/tlv320aic32x4-spi.c @@ -16,8 +16,6 @@ #include "tlv320aic32x4.h" -static const struct of_device_id aic32x4_of_id[]; - static int aic32x4_spi_probe(struct spi_device *spi) { struct regmap *regmap; @@ -31,18 +29,7 @@ static int aic32x4_spi_probe(struct spi_device *spi) config.read_flag_mask = 0x01; regmap = devm_regmap_init_spi(spi, &config); - - if (spi->dev.of_node) { - const struct of_device_id *oid; - - oid = of_match_node(aic32x4_of_id, spi->dev.of_node); - type = (uintptr_t)oid->data; - } else { - const struct spi_device_id *id_entry; - - id_entry = spi_get_device_id(spi); - type = id_entry->driver_data; - } + type = (uintptr_t)spi_get_device_match_data(spi); return aic32x4_probe(&spi->dev, regmap, type); } |