diff options
| author | Mark Brown <broonie@kernel.org> | 2021-12-01 14:15:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-12-01 14:15:12 +0000 |
| commit | 67140b64b68395b79177efcd16a7530ed5311e49 (patch) | |
| tree | b1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /sound/soc/codecs/cs35l41.c | |
| parent | f316c9d9ba8ea08d6994bc5ba8fa276eab186208 (diff) | |
| parent | 046aede2f847676f93a2ea4f48b77909c51dba40 (diff) | |
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'sound/soc/codecs/cs35l41.c')
| -rw-r--r-- | sound/soc/codecs/cs35l41.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index e04924526883..60332eae1162 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -438,7 +438,6 @@ static int cs35l41_otp_unpack(void *data) const struct cs35l41_otp_packed_element_t *otp_map; struct cs35l41_private *cs35l41 = data; int bit_offset, word_offset, ret, i; - unsigned int orig_spi_freq; unsigned int bit_sum = 8; u32 otp_val, otp_id_reg; u32 *otp_mem; @@ -462,9 +461,6 @@ static int cs35l41_otp_unpack(void *data) goto err_otp_unpack; } - if (cs35l41->otp_setup) - cs35l41->otp_setup(cs35l41, true, &orig_spi_freq); - ret = regmap_bulk_read(cs35l41->regmap, CS35L41_OTP_MEM0, otp_mem, CS35L41_OTP_SIZE_WORDS); if (ret < 0) { @@ -472,9 +468,6 @@ static int cs35l41_otp_unpack(void *data) goto err_otp_unpack; } - if (cs35l41->otp_setup) - cs35l41->otp_setup(cs35l41, false, &orig_spi_freq); - otp_map = otp_map_match->map; bit_offset = otp_map_match->bit_offset; |