[alsa-devel] [PATCHv2 0/3] Simplify the CODEC ASoC probe code.
Xiubo Li (3): ASoC: codec: Simplify ASoC probe code. ASoC: io: New signature for snd_soc_codec_set_cache_io() ASoC: core: Fix check before setting default I/O up try regmap
include/sound/soc.h | 7 +----- sound/soc/codecs/ad193x.c | 7 ------ sound/soc/codecs/adau1373.c | 6 ----- sound/soc/codecs/adav80x.c | 6 ----- sound/soc/codecs/ak4535.c | 6 ----- sound/soc/codecs/ak4641.c | 6 ----- sound/soc/codecs/ak4642.c | 6 ----- sound/soc/codecs/ak4671.c | 6 ----- sound/soc/codecs/alc5623.c | 7 ------ sound/soc/codecs/alc5632.c | 8 ------- sound/soc/codecs/cq93vc.c | 3 +-- sound/soc/codecs/cs4270.c | 9 -------- sound/soc/codecs/cs42l51.c | 6 ----- sound/soc/codecs/cs42l52.c | 6 ----- sound/soc/codecs/cs42l73.c | 8 ------- sound/soc/codecs/da7210.c | 7 ------ sound/soc/codecs/da7213.c | 7 ------ sound/soc/codecs/da732x.c | 8 ------- sound/soc/codecs/da9055.c | 7 ------ sound/soc/codecs/isabelle.c | 16 -------------- sound/soc/codecs/lm49453.c | 17 --------------- sound/soc/codecs/max9768.c | 5 ----- sound/soc/codecs/max98088.c | 6 ----- sound/soc/codecs/max98090.c | 8 ------- sound/soc/codecs/max98095.c | 6 ----- sound/soc/codecs/max9850.c | 6 ----- sound/soc/codecs/mc13783.c | 4 ++-- sound/soc/codecs/ml26124.c | 7 ------ sound/soc/codecs/rt5631.c | 8 ------- sound/soc/codecs/rt5640.c | 7 ------ sound/soc/codecs/sn95031.c | 2 -- sound/soc/codecs/ssm2518.c | 7 ------ sound/soc/codecs/ssm2602.c | 7 ------ sound/soc/codecs/sta32x.c | 10 --------- sound/soc/codecs/sta529.c | 7 ------ sound/soc/codecs/tlv320aic23.c | 6 ----- sound/soc/codecs/tlv320aic26.c | 2 -- sound/soc/codecs/tlv320aic32x4.c | 2 -- sound/soc/codecs/tlv320aic3x.c | 6 ----- sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/wm2000.c | 2 -- sound/soc/codecs/wm2200.c | 7 ------ sound/soc/codecs/wm5100.c | 7 ------ sound/soc/codecs/wm5102.c | 4 +--- sound/soc/codecs/wm5110.c | 3 +-- sound/soc/codecs/wm8350.c | 4 +--- sound/soc/codecs/wm8400.c | 3 +-- sound/soc/codecs/wm8510.c | 6 ----- sound/soc/codecs/wm8523.c | 6 ----- sound/soc/codecs/wm8580.c | 6 ----- sound/soc/codecs/wm8711.c | 6 ----- sound/soc/codecs/wm8728.c | 7 ------ sound/soc/codecs/wm8731.c | 7 ------ sound/soc/codecs/wm8737.c | 6 ----- sound/soc/codecs/wm8741.c | 6 ----- sound/soc/codecs/wm8750.c | 6 ----- sound/soc/codecs/wm8753.c | 7 ------ sound/soc/codecs/wm8770.c | 6 ----- sound/soc/codecs/wm8776.c | 6 ----- sound/soc/codecs/wm8804.c | 8 ------- sound/soc/codecs/wm8900.c | 6 ----- sound/soc/codecs/wm8903.c | 7 ------ sound/soc/codecs/wm8904.c | 8 ------- sound/soc/codecs/wm8940.c | 6 ----- sound/soc/codecs/wm8955.c | 8 ------- sound/soc/codecs/wm8960.c | 6 ----- sound/soc/codecs/wm8961.c | 6 ----- sound/soc/codecs/wm8962.c | 7 ------ sound/soc/codecs/wm8971.c | 6 ----- sound/soc/codecs/wm8974.c | 6 ----- sound/soc/codecs/wm8978.c | 6 ----- sound/soc/codecs/wm8983.c | 6 ----- sound/soc/codecs/wm8985.c | 7 ------ sound/soc/codecs/wm8988.c | 7 ------ sound/soc/codecs/wm8990.c | 6 ----- sound/soc/codecs/wm8991.c | 6 ----- sound/soc/codecs/wm8993.c | 7 ------ sound/soc/codecs/wm8994.c | 3 +-- sound/soc/codecs/wm8995.c | 7 ------ sound/soc/codecs/wm8996.c | 8 ------- sound/soc/codecs/wm8997.c | 4 +--- sound/soc/codecs/wm9081.c | 8 ------- sound/soc/codecs/wm9090.c | 7 ------ sound/soc/soc-core.c | 12 +++++++--- sound/soc/soc-io.c | 47 +++++++++++++++++----------------------- 85 files changed, 39 insertions(+), 547 deletions(-)
Signed-off-by: Xiubo Li Li.Xiubo@freescale.com ---
@Mark, @Lars, @All,
I have checked for each driver about the following issue from Lars:
"Just removing the set_cache_io() call will not work for all drivers. There are some MFD child devices which use regmap from the parent device. So dev_get_regmap() will return NULL for those."
And they are all fine for me but without testing.
For the CODECs that using MFD will split into another patch.
sound/soc/codecs/ad193x.c | 7 ------- sound/soc/codecs/adau1373.c | 6 ------ sound/soc/codecs/adav80x.c | 6 ------ sound/soc/codecs/ak4535.c | 6 ------ sound/soc/codecs/ak4641.c | 6 ------ sound/soc/codecs/ak4642.c | 6 ------ sound/soc/codecs/ak4671.c | 6 ------ sound/soc/codecs/alc5623.c | 7 ------- sound/soc/codecs/alc5632.c | 8 -------- sound/soc/codecs/cs4270.c | 9 --------- sound/soc/codecs/cs42l51.c | 6 ------ sound/soc/codecs/cs42l52.c | 6 ------ sound/soc/codecs/cs42l73.c | 8 -------- sound/soc/codecs/da7210.c | 7 ------- sound/soc/codecs/da7213.c | 7 ------- sound/soc/codecs/da732x.c | 8 -------- sound/soc/codecs/da9055.c | 7 ------- sound/soc/codecs/isabelle.c | 16 ---------------- sound/soc/codecs/lm49453.c | 17 ----------------- sound/soc/codecs/max9768.c | 5 ----- sound/soc/codecs/max98088.c | 6 ------ sound/soc/codecs/max98090.c | 8 -------- sound/soc/codecs/max98095.c | 6 ------ sound/soc/codecs/max9850.c | 6 ------ sound/soc/codecs/ml26124.c | 7 ------- sound/soc/codecs/rt5631.c | 8 -------- sound/soc/codecs/rt5640.c | 7 ------- sound/soc/codecs/sn95031.c | 2 -- sound/soc/codecs/ssm2518.c | 7 ------- sound/soc/codecs/ssm2602.c | 7 ------- sound/soc/codecs/sta32x.c | 10 ---------- sound/soc/codecs/sta529.c | 7 ------- sound/soc/codecs/tlv320aic23.c | 6 ------ sound/soc/codecs/tlv320aic26.c | 2 -- sound/soc/codecs/tlv320aic32x4.c | 2 -- sound/soc/codecs/tlv320aic3x.c | 6 ------ sound/soc/codecs/wm2000.c | 2 -- sound/soc/codecs/wm2200.c | 7 ------- sound/soc/codecs/wm5100.c | 7 ------- sound/soc/codecs/wm8510.c | 6 ------ sound/soc/codecs/wm8523.c | 6 ------ sound/soc/codecs/wm8580.c | 6 ------ sound/soc/codecs/wm8711.c | 6 ------ sound/soc/codecs/wm8728.c | 7 ------- sound/soc/codecs/wm8731.c | 7 ------- sound/soc/codecs/wm8737.c | 6 ------ sound/soc/codecs/wm8741.c | 6 ------ sound/soc/codecs/wm8750.c | 6 ------ sound/soc/codecs/wm8753.c | 7 ------- sound/soc/codecs/wm8770.c | 6 ------ sound/soc/codecs/wm8776.c | 6 ------ sound/soc/codecs/wm8804.c | 8 -------- sound/soc/codecs/wm8900.c | 6 ------ sound/soc/codecs/wm8903.c | 7 ------- sound/soc/codecs/wm8904.c | 8 -------- sound/soc/codecs/wm8940.c | 6 ------ sound/soc/codecs/wm8955.c | 8 -------- sound/soc/codecs/wm8960.c | 6 ------ sound/soc/codecs/wm8961.c | 6 ------ sound/soc/codecs/wm8962.c | 7 ------- sound/soc/codecs/wm8971.c | 6 ------ sound/soc/codecs/wm8974.c | 6 ------ sound/soc/codecs/wm8978.c | 6 ------ sound/soc/codecs/wm8983.c | 6 ------ sound/soc/codecs/wm8985.c | 7 ------- sound/soc/codecs/wm8988.c | 7 ------- sound/soc/codecs/wm8990.c | 6 ------ sound/soc/codecs/wm8991.c | 6 ------ sound/soc/codecs/wm8993.c | 7 ------- sound/soc/codecs/wm8995.c | 7 ------- sound/soc/codecs/wm8996.c | 8 -------- sound/soc/codecs/wm9081.c | 8 -------- sound/soc/codecs/wm9090.c | 7 ------- 73 files changed, 491 deletions(-)
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 9381a76..8d1a8e7 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -324,13 +324,6 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec) struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = ad193x->regmap; - ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "failed to set cache I/O: %d\n", ret); - return ret; - } - /* default setting for ad193x */
/* unmute dac channels */ diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c index 5765c22..682627c 100644 --- a/sound/soc/codecs/adau1373.c +++ b/sound/soc/codecs/adau1373.c @@ -1379,12 +1379,6 @@ static int adau1373_probe(struct snd_soc_codec *codec) int ret; int i;
- ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret) { - dev_err(codec->dev, "failed to set cache I/O: %d\n", ret); - return ret; - } - if (pdata) { if (pdata->num_drc > ARRAY_SIZE(pdata->drc_setting)) return -EINVAL; diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 9eb53c8..5851db6 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -804,12 +804,6 @@ static int adav80x_probe(struct snd_soc_codec *codec) int ret; struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
- ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret) { - dev_err(codec->dev, "failed to set cache I/O: %d\n", ret); - return ret; - } - /* Force PLLs on for SYSCLK output */ snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1"); snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2"); diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 684fe91..e55cb61 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -391,12 +391,6 @@ static int ak4535_probe(struct snd_soc_codec *codec) struct ak4535_priv *ak4535 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = ak4535->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } /* power on device */ ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c index 684b56f..d0440a6 100644 --- a/sound/soc/codecs/ak4641.c +++ b/sound/soc/codecs/ak4641.c @@ -521,12 +521,6 @@ static int ak4641_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* power on device */ ak4641_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 1f646c6..192baa5 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -467,12 +467,6 @@ static int ak4642_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ak4642_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index deb2b44..86ca8a1 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c @@ -615,12 +615,6 @@ static int ak4671_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return ret; diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c index ed50625..09f7e77 100644 --- a/sound/soc/codecs/alc5623.c +++ b/sound/soc/codecs/alc5623.c @@ -904,13 +904,6 @@ static int alc5623_probe(struct snd_soc_codec *codec) struct snd_soc_dapm_context *dapm = &codec->dapm; int ret;
- codec->control_data = alc5623->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - alc5623_reset(codec);
/* power on device */ diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index d885056..ec071a6 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c @@ -1063,14 +1063,6 @@ static int alc5632_probe(struct snd_soc_codec *codec) struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = alc5632->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* power on device */ alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 83c835d..3920e62 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -506,15 +506,6 @@ static int cs4270_probe(struct snd_soc_codec *codec) struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); int ret;
- /* Tell ASoC what kind of I/O to use to read the registers. ASoC will - * then do the I2C transactions itself. - */ - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "failed to set cache I/O (ret=%i)\n", ret); - return ret; - } - /* Disable auto-mute. This feature appears to be buggy. In some * situations, auto-mute will not deactivate when it should, so we want * this feature disabled by default. An application (e.g. alsactl) can diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index 5caf75b..1870620 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -488,12 +488,6 @@ static int cs42l51_probe(struct snd_soc_codec *codec) { int ret, reg;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* * DAC configuration * - Use signal processor diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index be455ea..449f77a 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -1111,12 +1111,6 @@ static int cs42l52_probe(struct snd_soc_codec *codec) struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = cs42l52->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } regcache_cache_only(cs42l52->regmap, true);
cs42l52_add_mic_controls(codec); diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 06f4291..0e24023 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1348,14 +1348,6 @@ static int cs42l73_probe(struct snd_soc_codec *codec) int ret; struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec);
- codec->control_data = cs42l73->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Set Charge Pump Frequency */ diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 01e55fc..5870539 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -1075,13 +1075,6 @@ static int da7210_probe(struct snd_soc_codec *codec)
dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
- codec->control_data = da7210->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - da7210->mclk_rate = 0; /* This will be set from set_sysclk() */ da7210->master = 0; /* This will be set from set_fmt() */
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 439d103..3f63765 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1397,13 +1397,6 @@ static int da7213_probe(struct snd_soc_codec *codec) struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec); struct da7213_platform_data *pdata = da7213->pdata;
- codec->control_data = da7213->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Default to using ALC auto offset calibration mode. */ snd_soc_update_bits(codec, DA7213_ALC_CTRL1, DA7213_ALC_CALIB_MODE_MAN, 0); diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 4d1c302..4fc84a6 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1518,14 +1518,6 @@ static int da732x_probe(struct snd_soc_codec *codec)
dapm->idle_bias_off = false;
- codec->control_data = da732x->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to register codec.\n"); - goto err; - } - da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY); err: return ret; diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index f118daa..58f8301 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -1386,13 +1386,6 @@ static int da9055_probe(struct snd_soc_codec *codec) int ret; struct da9055_priv *da9055 = snd_soc_codec_get_drvdata(codec);
- codec->control_data = da9055->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Enable all Gain Ramps */ snd_soc_update_bits(codec, DA9055_AUX_L_CTRL, DA9055_GAIN_RAMPING_EN, DA9055_GAIN_RAMPING_EN); diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index cb736dd..3e264a7 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -1090,23 +1090,7 @@ static struct snd_soc_dai_driver isabelle_dai[] = { }, };
-static int isabelle_probe(struct snd_soc_codec *codec) -{ - int ret = 0; - - codec->control_data = dev_get_regmap(codec->dev, NULL); - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - - return 0; -} - static struct snd_soc_codec_driver soc_codec_dev_isabelle = { - .probe = isabelle_probe, .set_bias_level = isabelle_set_bias_level, .controls = isabelle_snd_controls, .num_controls = ARRAY_SIZE(isabelle_snd_controls), diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index e533594..275b3f7 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c @@ -1407,22 +1407,6 @@ static int lm49453_resume(struct snd_soc_codec *codec) return 0; }
-static int lm49453_probe(struct snd_soc_codec *codec) -{ - struct lm49453_priv *lm49453 = snd_soc_codec_get_drvdata(codec); - int ret = 0; - - codec->control_data = lm49453->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - - return 0; -} - /* power down chip */ static int lm49453_remove(struct snd_soc_codec *codec) { @@ -1431,7 +1415,6 @@ static int lm49453_remove(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_lm49453 = { - .probe = lm49453_probe, .remove = lm49453_remove, .suspend = lm49453_suspend, .resume = lm49453_resume, diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c index 31f9156..ec481fc 100644 --- a/sound/soc/codecs/max9768.c +++ b/sound/soc/codecs/max9768.c @@ -135,11 +135,6 @@ static int max9768_probe(struct snd_soc_codec *codec) struct max9768 *max9768 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = max9768->regmap; - ret = snd_soc_codec_set_cache_io(codec, 2, 6, SND_SOC_REGMAP); - if (ret) - return ret; - if (max9768->flags & MAX9768_FLAG_CLASSIC_PWM) { ret = snd_soc_write(codec, MAX9768_CTRL, MAX9768_CTRL_PWM); if (ret) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 4b9274d..ef7cf89 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1914,12 +1914,6 @@ static int max98088_probe(struct snd_soc_codec *codec)
regcache_mark_dirty(max98088->regmap);
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* initialize private data */
max98088->sysclk = (unsigned)-1; diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index a75752f..90b301e 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2218,14 +2218,6 @@ static int max98090_probe(struct snd_soc_codec *codec)
max98090->codec = codec;
- codec->control_data = max98090->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Reset the codec, the DSP core, and disable all interrupts */ max98090_reset(max98090);
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 4c22582..03f0536 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -2238,12 +2238,6 @@ static int max98095_probe(struct snd_soc_codec *codec) struct i2c_client *client; int ret = 0;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* reset the codec, the DSP core, and disable all interrupts */ max98095_reset(codec);
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index 82757eb..abde0e3 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -314,12 +314,6 @@ static int max9850_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* enable zero-detect */ snd_soc_update_bits(codec, MAX9850_GENERAL_PURPOSE, 1, 1); /* enable slew-rate control */ diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 577fb87..7e998f3 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -588,13 +588,6 @@ static int ml26124_probe(struct snd_soc_codec *codec) { int ret; struct ml26124_priv *priv = snd_soc_codec_get_drvdata(codec); - codec->control_data = priv->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
/* Software Reset */ snd_soc_update_bits(codec, ML26124_SW_RST, 0x01, 1); diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index ce199d3..baa1870 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -1572,14 +1572,6 @@ static int rt5631_probe(struct snd_soc_codec *codec) unsigned int val; int ret;
- codec->control_data = rt5631->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - val = rt5631_read_index(codec, RT5631_ADDA_MIXER_INTL_REG3); if (val & 0x0002) rt5631->codec_version = 1; diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 1a1e115..1c721e6 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -1939,13 +1939,6 @@ static int rt5640_probe(struct snd_soc_codec *codec) int ret;
rt5640->codec = codec; - codec->control_data = rt5640->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
codec->dapm.idle_bias_off = 1; rt5640_set_bias_level(codec, SND_SOC_BIAS_OFF); diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index bca7d02..42dff26 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -825,8 +825,6 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec) { pr_debug("codec_probe called\n");
- snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - /* PCM interface config * This sets the pcm rx slot conguration to max 6 slots * for max 4 dais (2 stereo and 2 mono) diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 806f3d8..e7b73a0 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -651,13 +651,6 @@ static int ssm2518_probe(struct snd_soc_codec *codec) struct ssm2518 *ssm2518 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = ssm2518->regmap; - ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - return ssm2518_set_bias_level(codec, SND_SOC_BIAS_OFF); }
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 1294709..97b0454 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -562,13 +562,6 @@ static int ssm260x_codec_probe(struct snd_soc_codec *codec) struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = ssm2602->regmap; - ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = regmap_write(ssm2602->regmap, SSM2602_RESET, 0); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset: %d\n", ret); diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 2735361..95d8eab 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -872,16 +872,6 @@ static int sta32x_probe(struct snd_soc_codec *codec) return ret; }
- /* Tell ASoC what kind of I/O to use to read the registers. ASoC will - * then do the I2C transactions itself. - */ - codec->control_data = sta32x->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "failed to set cache I/O (ret=%i)\n", ret); - goto err; - } - /* Chip documentation explicitly requires that the reset values * of reserved register bits are left untouched. * Write the register default value to cache for reserved registers, diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c index f15b0e3..4532611 100644 --- a/sound/soc/codecs/sta529.c +++ b/sound/soc/codecs/sta529.c @@ -325,13 +325,6 @@ static int sta529_probe(struct snd_soc_codec *codec) struct sta529 *sta529 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = sta529->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } sta529_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 139f11f..3db3670 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -561,12 +561,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Reset codec */ snd_soc_write(codec, TLV320AIC23_RESET, 0);
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index ff5f23d..43069de 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -296,8 +296,6 @@ static int aic26_probe(struct snd_soc_codec *codec) struct aic26 *aic26 = dev_get_drvdata(codec->dev); int ret, reg;
- snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - aic26->codec = codec;
/* Reset the codec to power on defaults */ diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index c6bd7e7..1d9b117 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -614,8 +614,6 @@ static int aic32x4_probe(struct snd_soc_codec *codec) struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec); u32 tmp_reg;
- snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (gpio_is_valid(aic32x4->rstn_gpio)) { ndelay(10); gpio_set_value(aic32x4->rstn_gpio, 1); diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 470fbfb..b183510 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1344,12 +1344,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) INIT_LIST_HEAD(&aic3x->list); aic3x->codec = codec;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) { aic3x->disable_nb[i].nb.notifier_call = aic3x_regulator_event; aic3x->disable_nb[i].aic3x = aic3x; diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 8ae5027..83a2c87 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -786,8 +786,6 @@ static int wm2000_probe(struct snd_soc_codec *codec) { struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
- snd_soc_codec_set_cache_io(codec, 16, 8, SND_SOC_REGMAP); - /* This will trigger a transition to standby mode by default */ wm2000_anc_set_mode(wm2000);
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 1e0a083..2e721e0 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1554,15 +1554,8 @@ static int wm2200_probe(struct snd_soc_codec *codec) int ret;
wm2200->codec = codec; - codec->control_data = wm2200->regmap; codec->dapm.bias_level = SND_SOC_BIAS_OFF;
- ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2); if (ret != 0) return ret; diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index d3fa65f..eca983f 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2343,13 +2343,6 @@ static int wm5100_probe(struct snd_soc_codec *codec) int ret, i;
wm5100->codec = codec; - codec->control_data = wm5100->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
for (i = 0; i < ARRAY_SIZE(wm5100_dig_vu); i++) snd_soc_update_bits(codec, wm5100_dig_vu[i], WM5100_OUT_VU, diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 7df7d45..21aabe1 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -591,12 +591,6 @@ static int wm8510_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret); - return ret; - } - wm8510_reset(codec);
/* power on device */ diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 5dfd571..b16f93f 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c @@ -398,12 +398,6 @@ static int wm8523_probe(struct snd_soc_codec *codec) wm8523->rate_constraint.count = ARRAY_SIZE(wm8523->rate_constraint_list);
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Change some default settings - latch VU and enable ZC */ snd_soc_update_bits(codec, WM8523_DAC_GAINR, WM8523_DACR_VU, WM8523_DACR_VU); diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 318989a..7558c83 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -869,12 +869,6 @@ static int wm8580_probe(struct snd_soc_codec *codec) struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); int ret = 0;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = regulator_bulk_enable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies); if (ret != 0) { diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index d99f948..ef6cbc7 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -367,12 +367,6 @@ static int wm8711_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8711_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index cd89033..1c96cc9 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -230,13 +230,6 @@ static int wm8728_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - printk(KERN_ERR "wm8728: failed to configure cache I/O: %d\n", - ret); - return ret; - } - /* power on device */ wm8728_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index d9655f9..d74f439 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -583,13 +583,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); int ret = 0, i;
- codec->control_data = wm8731->regmap; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - for (i = 0; i < ARRAY_SIZE(wm8731->supplies); i++) wm8731->supplies[i].supply = wm8731_supply_names[i];
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index ecc4e87..b27f26c 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c @@ -570,12 +570,6 @@ static int wm8737_probe(struct snd_soc_codec *codec) struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = regulator_bulk_enable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies); if (ret != 0) { diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index dd02ebf..b33542a 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -429,12 +429,6 @@ static int wm8741_probe(struct snd_soc_codec *codec) goto err_get; }
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - goto err_enable; - } - ret = wm8741_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 78616a6..33990b6 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -702,12 +702,6 @@ static int wm8750_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - printk(KERN_ERR "wm8750: failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8750_reset(codec); if (ret < 0) { printk(KERN_ERR "wm8750: failed to reset: %d\n", ret); diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index be85da9..0d1670b 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1471,13 +1471,6 @@ static int wm8753_probe(struct snd_soc_codec *codec)
INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8753_work);
- codec->control_data = wm8753->regmap; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8753_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset: %d\n", ret); diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 5bce210..c61aeb3 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -580,12 +580,6 @@ static int wm8770_probe(struct snd_soc_codec *codec) wm8770 = snd_soc_codec_get_drvdata(codec); wm8770->codec = codec;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = regulator_bulk_enable(ARRAY_SIZE(wm8770->supplies), wm8770->supplies); if (ret) { diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index ef82467..70952ce 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -430,12 +430,6 @@ static int wm8776_probe(struct snd_soc_codec *codec) { int ret = 0;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8776_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset: %d\n", ret); diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 72d12bb..ee76f0f 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -546,14 +546,6 @@ static int wm8804_probe(struct snd_soc_codec *codec)
wm8804 = snd_soc_codec_get_drvdata(codec);
- codec->control_data = wm8804->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); - return ret; - } - for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++) wm8804->supplies[i].supply = wm8804_supply_names[i];
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 43c2201..155eb1e 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -1180,12 +1180,6 @@ static int wm8900_probe(struct snd_soc_codec *codec) { int ret = 0, reg;
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - reg = snd_soc_read(codec, WM8900_REG_ID); if (reg != 0x8900) { dev_err(codec->dev, "Device is not a WM8900 - ID %x\n", reg); diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index b82b70a..0ae2457 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1900,13 +1900,6 @@ static int wm8903_probe(struct snd_soc_codec *codec) int ret;
wm8903->codec = codec; - codec->control_data = wm8903->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
/* power on device */ wm8903_set_bias_level(codec, SND_SOC_BIAS_STANDBY); diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 27299cd..b6adaf1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2050,8 +2050,6 @@ static int wm8904_probe(struct snd_soc_codec *codec) struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = wm8904->regmap; - switch (wm8904->devtype) { case WM8904: break; @@ -2064,12 +2062,6 @@ static int wm8904_probe(struct snd_soc_codec *codec) return -EINVAL; }
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - wm8904_handle_pdata(codec);
wm8904_add_widgets(codec); diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 87f032d..fc6eec9 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -712,12 +712,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) int ret; u16 reg;
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8940_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index d4dcaec..fecd4e4 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -895,14 +895,6 @@ static int wm8955_probe(struct snd_soc_codec *codec) struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); int ret, i;
- codec->control_data = wm8955->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++) wm8955->supplies[i].supply = wm8955_supply_names[i];
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index f156010..d04e9ca 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -976,12 +976,6 @@ static int wm8960_probe(struct snd_soc_codec *codec) wm8960->set_bias_level = wm8960_set_bias_level_capless; }
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8960_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index ce8fa6e..c58ff44 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -839,12 +839,6 @@ static int wm8961_probe(struct snd_soc_codec *codec) int ret = 0; u16 reg;
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Enable class W */ reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_B); reg |= WM8961_CP_DYN_PWR_MASK; diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 62af9dc..5522d25 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3424,13 +3424,6 @@ static int wm8962_probe(struct snd_soc_codec *codec) bool dmicclk, dmicdat;
wm8962->codec = codec; - codec->control_data = wm8962->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
wm8962->disable_nb[0].notifier_call = wm8962_regulator_event_0; wm8962->disable_nb[1].notifier_call = wm8962_regulator_event_1; diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 67aba78..09b7b42 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -648,12 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec) int ret = 0; u16 reg;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret); - return ret; - } - INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work); wm8971_workq = create_workqueue("wm8971"); if (wm8971_workq == NULL) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 6e16c43..0627c56 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -593,12 +593,6 @@ static int wm8974_probe(struct snd_soc_codec *codec) { int ret = 0;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8974_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index a9e2f46..15ce4bb 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -982,12 +982,6 @@ static int wm8978_probe(struct snd_soc_codec *codec) * default hardware setting */ wm8978->sysclk = WM8978_PLL; - codec->control_data = wm8978->regmap; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - }
/* * Set the update bit in all registers, that have one. This way all diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index 58f0551..2b9bfa5 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c @@ -995,12 +995,6 @@ static int wm8983_probe(struct snd_soc_codec *codec) int ret; int i;
- ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); - return ret; - } - ret = snd_soc_write(codec, WM8983_SOFTWARE_RESET, 0); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset: %d\n", ret); diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index d786f2b..5473dc9 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -995,13 +995,6 @@ static int wm8985_probe(struct snd_soc_codec *codec) int ret;
wm8985 = snd_soc_codec_get_drvdata(codec); - codec->control_data = wm8985->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); - return ret; - }
for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++) wm8985->supplies[i].supply = wm8985_supply_names[i]; diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 0277a76..bf60b15 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c @@ -813,13 +813,6 @@ static int wm8988_probe(struct snd_soc_codec *codec) struct wm8988_priv *wm8988 = snd_soc_codec_get_drvdata(codec); int ret = 0;
- codec->control_data = wm8988->regmap; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - ret = wm8988_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 33f53ab..f87d330 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -1291,12 +1291,6 @@ static int wm8990_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret < 0) { - printk(KERN_ERR "wm8990: failed to set cache I/O: %d\n", ret); - return ret; - } - wm8990_reset(codec);
/* charge output caps */ diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c index 32d2195..e88d709 100644 --- a/sound/soc/codecs/wm8991.c +++ b/sound/soc/codecs/wm8991.c @@ -1250,12 +1250,6 @@ static int wm8991_probe(struct snd_soc_codec *codec) { int ret;
- ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); - return ret; - } - wm8991_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 7b0630a..f825dc0 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1493,13 +1493,6 @@ static int wm8993_probe(struct snd_soc_codec *codec) wm8993->hubs_data.dcs_codes_r = -2; wm8993->hubs_data.series_startup = 1;
- codec->control_data = wm8993->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Latch volume update bits and default ZC on */ snd_soc_update_bits(codec, WM8993_RIGHT_DAC_DIGITAL_VOLUME, WM8993_DAC_VU, WM8993_DAC_VU); diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 33ff361..e8f331d 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -2042,13 +2042,6 @@ static int wm8995_probe(struct snd_soc_codec *codec) wm8995 = snd_soc_codec_get_drvdata(codec); wm8995->codec = codec;
- codec->control_data = wm8995->regmap; - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret < 0) { - dev_err(codec->dev, "Failed to set cache i/o: %d\n", ret); - return ret; - } - for (i = 0; i < ARRAY_SIZE(wm8995->supplies); i++) wm8995->supplies[i].supply = wm8995_supply_names[i];
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index c8244af..acae660 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2633,14 +2633,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) init_completion(&wm8996->dcs_done); init_completion(&wm8996->fll_lock);
- codec->control_data = wm8996->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - goto err; - } - if (wm8996->pdata.num_retune_mobile_cfgs) wm8996_retune_mobile_pdata(codec); else diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 721cee7..a6fdcd1 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1262,14 +1262,6 @@ static int wm9081_probe(struct snd_soc_codec *codec) struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = wm9081->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Enable zero cross by default */ snd_soc_update_bits(codec, WM9081_ANALOGUE_LINEOUT, WM9081_LINEOUTZC, WM9081_LINEOUTZC); diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index a07fe16..1257cf5 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c @@ -525,13 +525,6 @@ static int wm9090_probe(struct snd_soc_codec *codec) struct wm9090_priv *wm9090 = dev_get_drvdata(codec->dev); int ret;
- codec->control_data = wm9090->regmap; - ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); - if (ret != 0) { - dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; - } - /* Configure some defaults; they will be written out when we * bring the bias up. */
On 02/28/2014 10:04 AM, Xiubo Li wrote:
Signed-off-by: Xiubo Li Li.Xiubo@freescale.com
@Mark, @Lars, @All,
I have checked for each driver about the following issue from Lars:
"Just removing the set_cache_io() call will not work for all drivers. There are some MFD child devices which use regmap from the parent device. So dev_get_regmap() will return NULL for those."
And they are all fine for me but without testing.
For the CODECs that using MFD will split into another patch.
Looks good in general, but try to build these kinds of changes with CONFIG_COMPILE_TEST=y and CONFIG_SND_SOC_ALL_CODECS=y before sending the patch. There are a lot of warnings about unused variables caused by this patch.
sound/soc/codecs/ad193x.c: In function 'ad193x_codec_probe': sound/soc/codecs/ad193x.c:343:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/adau1373.c: In function 'adau1373_probe': sound/soc/codecs/adau1373.c:1379:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/adav80x.c: In function 'adav80x_probe': sound/soc/codecs/adav80x.c:804:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4535.c: In function 'ak4535_probe': sound/soc/codecs/ak4535.c:392:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4535.c:391:22: warning: unused variable 'ak4535' [-Wunused-variable] sound/soc/codecs/ak4641.c: In function 'ak4641_probe': sound/soc/codecs/ak4641.c:522:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4642.c: In function 'ak4642_probe': sound/soc/codecs/ak4642.c:468:6: warning: unused variable 'ret' [-Wunused- sound/soc/codecs/ak4671.c: In function 'ak4671_probe': sound/soc/codecs/ak4671.c:620:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/cs42l52.c: In function 'cs42l52_probe': sound/soc/codecs/cs42l52.c:1125:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/cs42l73.c: In function 'cs42l73_probe': sound/soc/codecs/cs42l73.c:1363:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/da7210.c: In function 'da7210_probe': sound/soc/codecs/da7210.c:1074:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/da7213.c: In function 'da7213_probe': sound/soc/codecs/da7213.c:1396:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/da732x.c: In function 'da732x_probe': sound/soc/codecs/da732x.c:1522:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/da9055.c: In function 'da9055_probe': sound/soc/codecs/da9055.c:1386:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/max9850.c: In function 'max9850_probe': sound/soc/codecs/max9850.c:315:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ml26124.c: In function 'ml26124_probe': sound/soc/codecs/ml26124.c:590:23: warning: unused variable 'priv' [-Wunused-variable] sound/soc/codecs/ml26124.c:589:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/rt5631.c: In function 'rt5631_probe': sound/soc/codecs/rt5631.c:1573:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/rt5640.c: In function 'rt5640_probe': sound/soc/codecs/rt5640.c:1939:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ssm2518.c: In function 'ssm2518_probe': sound/soc/codecs/ssm2518.c:652:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ssm2518.c:651:18: warning: unused variable 'ssm2518' [-Wunused-variable] sound/soc/codecs/sta32x.c: In function 'sta32x_probe': sound/soc/codecs/sta32x.c:940:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/sta529.c: In function 'sta529_probe': sound/soc/codecs/sta529.c:326:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/sta529.c:325:17: warning: unused variable 'sta529' [-Wunused-variable] sound/soc/codecs/tlv320aic23.c: In function 'tlv320aic23_probe': sound/soc/codecs/tlv320aic23.c:562:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8510.c: In function 'wm8510_probe': sound/soc/codecs/wm8510.c:599:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8523.c: In function 'wm8523_probe': sound/soc/codecs/wm8523.c:395:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8728.c: In function 'wm8728_probe': sound/soc/codecs/wm8728.c:236:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8900.c: In function 'wm8900_probe': sound/soc/codecs/wm8900.c:1181:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8903.c: In function 'wm8903_probe': sound/soc/codecs/wm8903.c:1907:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8904.c: In function 'wm8904_probe': sound/soc/codecs/wm8904.c:2051:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8961.c: In function 'wm8961_probe': sound/soc/codecs/wm8961.c:839:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8978.c: In function 'wm8978_probe': sound/soc/codecs/wm8978.c:978:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8988.c: In function 'wm8988_probe': sound/soc/codecs/wm8988.c:813:22: warning: unused variable 'wm8988' [-Wunused-variable] sound/soc/codecs/wm8990.c: In function 'wm8990_probe': sound/soc/codecs/wm8990.c:1292:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8991.c: In function 'wm8991_probe': sound/soc/codecs/wm8991.c:1251:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8996.c: In function 'wm8996_probe': sound/soc/codecs/wm8996.c:2679:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/wm9081.c: In function 'wm9081_probe': sound/soc/codecs/wm9081.c:1278:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm9090.c: In function 'wm9090_probe': sound/soc/codecs/wm9090.c:526:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm9090.c:525:22: warning: unused variable 'wm9090' [-Wunused-variable]
Looks good in general, but try to build these kinds of changes with CONFIG_COMPILE_TEST=y and CONFIG_SND_SOC_ALL_CODECS=y before sending the patch. There are a lot of warnings about unused variables caused by this patch.
@Lars,
Oh, yes, these are very low-level errors, I will fix them then.
Thanks very much.
sound/soc/codecs/ad193x.c: In function 'ad193x_codec_probe': sound/soc/codecs/ad193x.c:343:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/adau1373.c: In function 'adau1373_probe': sound/soc/codecs/adau1373.c:1379:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/adav80x.c: In function 'adav80x_probe': sound/soc/codecs/adav80x.c:804:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4535.c: In function 'ak4535_probe': sound/soc/codecs/ak4535.c:392:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4535.c:391:22: warning: unused variable 'ak4535' [-Wunused-variable] sound/soc/codecs/ak4641.c: In function 'ak4641_probe': sound/soc/codecs/ak4641.c:522:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ak4642.c: In function 'ak4642_probe': sound/soc/codecs/ak4642.c:468:6: warning: unused variable 'ret' [-Wunused- sound/soc/codecs/ak4671.c: In function 'ak4671_probe': sound/soc/codecs/ak4671.c:620:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/cs42l52.c: In function 'cs42l52_probe': sound/soc/codecs/cs42l52.c:1125:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/cs42l73.c: In function 'cs42l73_probe': sound/soc/codecs/cs42l73.c:1363:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/da7210.c: In function 'da7210_probe': sound/soc/codecs/da7210.c:1074:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/da7213.c: In function 'da7213_probe': sound/soc/codecs/da7213.c:1396:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/da732x.c: In function 'da732x_probe': sound/soc/codecs/da732x.c:1522:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/da9055.c: In function 'da9055_probe': sound/soc/codecs/da9055.c:1386:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/max9850.c: In function 'max9850_probe': sound/soc/codecs/max9850.c:315:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ml26124.c: In function 'ml26124_probe': sound/soc/codecs/ml26124.c:590:23: warning: unused variable 'priv' [-Wunused-variable] sound/soc/codecs/ml26124.c:589:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/rt5631.c: In function 'rt5631_probe': sound/soc/codecs/rt5631.c:1573:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/rt5640.c: In function 'rt5640_probe': sound/soc/codecs/rt5640.c:1939:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ssm2518.c: In function 'ssm2518_probe': sound/soc/codecs/ssm2518.c:652:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/ssm2518.c:651:18: warning: unused variable 'ssm2518' [-Wunused-variable] sound/soc/codecs/sta32x.c: In function 'sta32x_probe': sound/soc/codecs/sta32x.c:940:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/sta529.c: In function 'sta529_probe': sound/soc/codecs/sta529.c:326:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/sta529.c:325:17: warning: unused variable 'sta529' [-Wunused-variable] sound/soc/codecs/tlv320aic23.c: In function 'tlv320aic23_probe': sound/soc/codecs/tlv320aic23.c:562:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8510.c: In function 'wm8510_probe': sound/soc/codecs/wm8510.c:599:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8523.c: In function 'wm8523_probe': sound/soc/codecs/wm8523.c:395:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8728.c: In function 'wm8728_probe': sound/soc/codecs/wm8728.c:236:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8900.c: In function 'wm8900_probe': sound/soc/codecs/wm8900.c:1181:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8903.c: In function 'wm8903_probe': sound/soc/codecs/wm8903.c:1907:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm8904.c: In function 'wm8904_probe': sound/soc/codecs/wm8904.c:2051:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8961.c: In function 'wm8961_probe': sound/soc/codecs/wm8961.c:839:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8978.c: In function 'wm8978_probe': sound/soc/codecs/wm8978.c:978:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8988.c: In function 'wm8988_probe': sound/soc/codecs/wm8988.c:813:22: warning: unused variable 'wm8988' [-Wunused-variable] sound/soc/codecs/wm8990.c: In function 'wm8990_probe': sound/soc/codecs/wm8990.c:1292:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8991.c: In function 'wm8991_probe': sound/soc/codecs/wm8991.c:1251:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm8996.c: In function 'wm8996_probe': sound/soc/codecs/wm8996.c:2679:1: warning: label 'err' defined but not used [-Wunused-label] sound/soc/codecs/wm9081.c: In function 'wm9081_probe': sound/soc/codecs/wm9081.c:1278:2: warning: 'ret' is used uninitialized in this function [-Wuninitialized] sound/soc/codecs/wm9090.c: In function 'wm9090_probe': sound/soc/codecs/wm9090.c:526:6: warning: unused variable 'ret' [-Wunused-variable] sound/soc/codecs/wm9090.c:525:22: warning: unused variable 'wm9090' [-Wunused-variable]
On Fri, Feb 28, 2014 at 05:04:25PM +0800, Xiubo Li wrote:
"Just removing the set_cache_io() call will not work for all drivers. There are some MFD child devices which use regmap from the parent device. So dev_get_regmap() will return NULL for those."
This is the sort of thing that I was referring to when talking about doing the non-boring drivers separately. As well as the warnings Lars mentioned there's a bisection issue here:
- codec->control_data = da7213->regmap;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
- if (ret < 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);return ret;- }
- /* Default to using ALC auto offset calibration mode. */ snd_soc_update_bits(codec, DA7213_ALC_CTRL1, DA7213_ALC_CALIB_MODE_MAN, 0);
Unless the core sets up the I/O before calling probe() the above is going to mean that the snd_soc_update_bits() call fails since the I/O operations won't have been set up. There is a defualt call to set a regmap up but it's only done after the probe.
"Just removing the set_cache_io() call will not work for all drivers. There are some MFD child devices which use regmap from the parent device. So dev_get_regmap() will return NULL for those."
This is the sort of thing that I was referring to when talking about doing the non-boring drivers separately. As well as the warnings Lars mentioned there's a bisection issue here:
- codec->control_data = da7213->regmap;
- ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
- if (ret < 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);return ret;- }
- /* Default to using ALC auto offset calibration mode. */ snd_soc_update_bits(codec, DA7213_ALC_CTRL1, DA7213_ALC_CALIB_MODE_MAN, 0);
Unless the core sets up the I/O before calling probe() the above is going to mean that the snd_soc_update_bits() call fails since the I/O operations won't have been set up. There is a defualt call to set a regmap up but it's only done after the probe.
Yes, like the SGTL5000 CODEC driver, which needs to read the chip information in main probe. And then it must use the regmap core APIs directly.
And I have do another research early, all the CODEC drivers who are calling set_cache_io() in ASoC probes, and before that they all are using the regmap core APIs instead of ASoC ones if needed.
I think we should move the set_cache_io() calling more earlier as we discussed before, but need much more research and testing. Splitting them into another separate patch later will be much better and easier to be reviewed.
Thanks,
-- Best Regards, Xiubo
On Mon, Mar 03, 2014 at 03:01:52AM +0000, Li.Xiubo@freescale.com wrote:
I think we should move the set_cache_io() calling more earlier as we discussed before, but need much more research and testing. Splitting them into another separate patch later will be much better and easier to be reviewed.
Yes, exactly - do the simple, boring cases first and then anything that needs thought separately.
Now that all users have been converted to regmap and the config.reg_bits and config.val_bits can be setted by each user through regmap core API. So these two params are redundant here.
Since the only control type that left is SND_SOC_REGMAP, so remove it. Drop the control params and add struct regmap *regmap to simplify the code.
Signed-off-by: Xiubo Li Li.Xiubo@freescale.com --- include/sound/soc.h | 7 +------ sound/soc/codecs/cq93vc.c | 3 +-- sound/soc/codecs/mc13783.c | 4 ++-- sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/wm5102.c | 4 +--- sound/soc/codecs/wm5110.c | 3 +-- sound/soc/codecs/wm8350.c | 4 +--- sound/soc/codecs/wm8400.c | 3 +-- sound/soc/codecs/wm8994.c | 3 +-- sound/soc/codecs/wm8997.c | 4 +--- sound/soc/soc-core.c | 2 +- sound/soc/soc-io.c | 47 ++++++++++++++++++------------------------ 12 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index ecfb334..4c4d7e1 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -354,10 +354,6 @@ typedef int (*hw_write_t)(void *,const char* ,int);
extern struct snd_ac97_bus_ops *soc_ac97_ops;
-enum snd_soc_control_type { - SND_SOC_REGMAP, -}; - enum snd_soc_pcm_subclass { SND_SOC_PCM_CLASS_PCM = 0, SND_SOC_PCM_CLASS_BE = 1, @@ -404,8 +400,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec, int snd_soc_codec_writable_register(struct snd_soc_codec *codec, unsigned int reg); int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, - int addr_bits, int data_bits, - enum snd_soc_control_type control); + struct regmap *regmap); int snd_soc_cache_sync(struct snd_soc_codec *codec); int snd_soc_cache_init(struct snd_soc_codec *codec); int snd_soc_cache_exit(struct snd_soc_codec *codec); diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 43737a27..1e25c7a 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -138,9 +138,8 @@ static int cq93vc_probe(struct snd_soc_codec *codec) struct davinci_vc *davinci_vc = codec->dev->platform_data;
davinci_vc->cq93vc.codec = codec; - codec->control_data = davinci_vc->regmap;
- snd_soc_codec_set_cache_io(codec, 32, 32, SND_SOC_REGMAP); + snd_soc_codec_set_cache_io(codec, davinci_vc->regmap);
/* Off, with power on */ cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY); diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index c605036..3331cc7 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -614,8 +614,8 @@ static int mc13783_probe(struct snd_soc_codec *codec) struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = dev_get_regmap(codec->dev->parent, NULL); - ret = snd_soc_codec_set_cache_io(codec, 8, 24, SND_SOC_REGMAP); + ret = snd_soc_codec_set_cache_io(codec, + dev_get_regmap(codec->dev->parent, NULL)); if (ret != 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); return ret; diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 9ce8496..30d8596 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -122,7 +122,6 @@ struct tlv320dac33_priv { unsigned int uthr;
enum dac33_state state; - enum snd_soc_control_type control_type; void *control_data; };
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 293dffc..01b6ee4 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1760,9 +1760,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = priv->core.arizona->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP); + ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap); if (ret != 0) return ret;
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 4de2bf1..cf5d828f 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1587,10 +1587,9 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = priv->core.arizona->regmap; priv->core.arizona->dapm = &codec->dapm;
- ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP); + ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap); if (ret != 0) return ret;
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index a183dcf..757256b 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1505,9 +1505,7 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) if (ret != 0) return ret;
- codec->control_data = wm8350->regmap; - - snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); + snd_soc_codec_set_cache_io(codec, wm8350->regmap);
/* Put the codec into reset if it wasn't already */ wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 6d684d9..146564f 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1316,10 +1316,9 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
snd_soc_codec_set_drvdata(codec, priv); priv->wm8400 = wm8400; - codec->control_data = wm8400->regmap; priv->codec = codec;
- snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP); + snd_soc_codec_set_cache_io(codec, wm8400->regmap);
ret = devm_regulator_bulk_get(wm8400->dev, ARRAY_SIZE(power), &power[0]); diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 699b527..decc3c9 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3999,9 +3999,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) int ret, i;
wm8994->hubs.codec = codec; - codec->control_data = control->regmap;
- snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); + snd_soc_codec_set_cache_io(codec, control->regmap);
mutex_init(&wm8994->accdet_lock); INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap, diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 4e6442c..5e1a32e 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1053,9 +1053,7 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec) struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec); int ret;
- codec->control_data = priv->core.arizona->regmap; - - ret = snd_soc_codec_set_cache_io(codec, 32, 16, SND_SOC_REGMAP); + ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap); if (ret != 0) return ret;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c159a34..6880fad 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1139,7 +1139,7 @@ static int soc_probe_codec(struct snd_soc_card *card,
/* Set the default I/O up try regmap */ if (dev_get_regmap(codec->dev, NULL)) - snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); + snd_soc_codec_set_cache_io(codec, NULL);
if (driver->probe) { ret = driver->probe(codec); diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 18353f1..8aa0869 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -69,9 +69,7 @@ static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg) * snd_soc_codec_set_cache_io: Set up standard I/O functions. * * @codec: CODEC to configure. - * @addr_bits: Number of bits of register address data. - * @data_bits: Number of bits of data per register. - * @control: Control bus used. + * @map: Register map to write to * * Register formats are frequently shared between many I2C and SPI * devices. In order to promote code reuse the ASoC core provides @@ -85,41 +83,36 @@ static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg) * volatile registers. */ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, - int addr_bits, int data_bits, - enum snd_soc_control_type control) + struct regmap *regmap) { int ret;
+ /* Device has made its own regmap arrangements */ + if (!regmap) + codec->control_data = dev_get_regmap(codec->dev, NULL); + else + codec->control_data = regmap; + + if (IS_ERR(codec->control_data)) + return PTR_ERR(codec->control_data); + codec->write = hw_write; codec->read = hw_read;
- switch (control) { - case SND_SOC_REGMAP: - /* Device has made its own regmap arrangements */ - codec->using_regmap = true; - if (!codec->control_data) - codec->control_data = dev_get_regmap(codec->dev, NULL); - - if (codec->control_data) { - ret = regmap_get_val_bytes(codec->control_data); - /* Errors are legitimate for non-integer byte - * multiples */ - if (ret > 0) - codec->val_bytes = ret; - } - break; - - default: - return -EINVAL; - } + ret = regmap_get_val_bytes(codec->control_data); + /* Errors are legitimate for non-integer byte + * multiples */ + if (ret > 0) + codec->val_bytes = ret; + + codec->using_regmap = true;
- return PTR_ERR_OR_ZERO(codec->control_data); + return 0; } EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); #else int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, - int addr_bits, int data_bits, - enum snd_soc_control_type control) + struct regmap *regmap) { return -ENOTSUPP; }
On Fri, Feb 28, 2014 at 05:04:26PM +0800, Xiubo Li wrote:
Now that all users have been converted to regmap and the config.reg_bits and config.val_bits can be setted by each user through regmap core API. So these two params are redundant here.
This looks good.
On Fri, Feb 28, 2014 at 05:04:26PM +0800, Xiubo Li wrote:
Now that all users have been converted to regmap and the config.reg_bits and config.val_bits can be setted by each user through regmap core API. So these two params are redundant here.
Actually, I think the way to fix the issue with CODECs doing I/O in probe is to provide a way for drivers to specify a regmap when registering the CODEC (rather than during probe) and then move the initialisation of the regmap before the probe function is called. That would make set_cache_io() go away entirely.
On 03/01/2014 05:34 AM, Mark Brown wrote:
On Fri, Feb 28, 2014 at 05:04:26PM +0800, Xiubo Li wrote:
Now that all users have been converted to regmap and the config.reg_bits and config.val_bits can be setted by each user through regmap core API. So these two params are redundant here.
Actually, I think the way to fix the issue with CODECs doing I/O in probe is to provide a way for drivers to specify a regmap when registering the CODEC (rather than during probe) and then move the initialisation of the regmap before the probe function is called. That would make set_cache_io() go away entirely.
Yep, that's actually my preference as well.
Same with 'ASoC: core: Fix check before defaulting to regmap':
(Check if the chip has provided a write operation (which is mandatory for I/O) rather than looking for control data as some of the MFDs use a global for this. Also skip the attempt if there's no regmap available by device in case things get confused by the attempt to default.)
Signed-off-by: Xiubo Li Li.Xiubo@freescale.com --- sound/soc/soc-core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6880fad..a14155b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1137,9 +1137,15 @@ static int soc_probe_codec(struct snd_soc_card *card,
codec->dapm.idle_bias_off = driver->idle_bias_off;
- /* Set the default I/O up try regmap */ - if (dev_get_regmap(codec->dev, NULL)) - snd_soc_codec_set_cache_io(codec, NULL); + if (!codec->write && dev_get_regmap(codec->dev, NULL)) { + /* Set the default I/O up try regmap */ + ret = snd_soc_codec_set_cache_io(codec, NULL); + if (ret < 0) { + dev_err(codec->dev, + "Failed to set cache I/O: %d\n", ret); + goto err_probe; + } + }
if (driver->probe) { ret = driver->probe(codec);
participants (4)
-
Lars-Peter Clausen -
Li.Xiubo＠freescale.com -
Mark Brown -
Xiubo Li