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

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

ASoC: Remove unused "control_data" field of struct wm8940_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 644f1ff4

sound/soc/codecs/wm8940.c

+0 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
struct wm8940_priv {

	unsigned int sysclk;

	enum snd_soc_control_type control_type;

	void *control_data;

};



static u16 wm8940_reg_defaults[] = {
@@ -693,7 +692,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) 
	int ret;

	u16 reg;



	codec->control_data = wm8940->control_data;

	ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8940->control_type);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -758,7 +756,6 @@ static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, 
		return -ENOMEM;



	i2c_set_clientdata(i2c, wm8940);

	wm8940->control_data = i2c;

	wm8940->control_type = SND_SOC_I2C;



	ret = snd_soc_register_codec(&i2c->dev,