Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec61bde5 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Remove unused "control_data" field of struct wm8960_priv 



The control_data field is used to initialize the codec's control_data field,
but since this is also done by the snd-soc-cache core, the redundant
assignment can be removed and the field can be dropped.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent c9241ec6

sound/soc/codecs/wm8960.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ static const u16 wm8960_reg[WM8960_CACHEREGNUM] = { 




struct wm8960_priv {

struct wm8960_priv {

	enum snd_soc_control_type control_type;

	enum snd_soc_control_type control_type;

	void *control_data;

	int (*set_bias_level)(struct snd_soc_codec *,

	int (*set_bias_level)(struct snd_soc_codec *,

			      enum snd_soc_bias_level level);

			      enum snd_soc_bias_level level);

	struct snd_soc_dapm_widget *lout1;

	struct snd_soc_dapm_widget *lout1;
@@ -925,7 +924,6 @@ static int wm8960_probe(struct snd_soc_codec *codec) 
	u16 reg;

	u16 reg;





	wm8960->set_bias_level = wm8960_set_bias_level_out3;

	wm8960->set_bias_level = wm8960_set_bias_level_out3;

	codec->control_data = wm8960->control_data;





	if (!pdata) {

	if (!pdata) {

		dev_warn(codec->dev, "No platform data supplied\n");

		dev_warn(codec->dev, "No platform data supplied\n");
@@ -1015,7 +1013,6 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, 




	i2c_set_clientdata(i2c, wm8960);

	i2c_set_clientdata(i2c, wm8960);

	wm8960->control_type = SND_SOC_I2C;

	wm8960->control_type = SND_SOC_I2C;

	wm8960->control_data = i2c;





	ret = snd_soc_register_codec(&i2c->dev,

	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_wm8960, &wm8960_dai, 1);

			&soc_codec_dev_wm8960, &wm8960_dai, 1);