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

Commit 7bfbdfea authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: twl4030: Remove check defaults functionality 



No need to keep the check defaults functionality anymore.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a8fc415c

include/linux/i2c/twl.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -670,7 +670,6 @@ struct twl4030_codec_data { 
	unsigned int digimic_delay; /* in ms */

	unsigned int digimic_delay; /* in ms */

	unsigned int ramp_delay_value;

	unsigned int ramp_delay_value;

	unsigned int offset_cncl_path;

	unsigned int offset_cncl_path;

	unsigned int check_defaults:1;

	unsigned int reset_registers:1;

	unsigned int reset_registers:1;

	unsigned int hs_extmute:1;

	unsigned int hs_extmute:1;

	int hs_extmute_gpio;

	int hs_extmute_gpio;

sound/soc/codecs/twl4030.c

+0 −23
Original line number Original line Diff line number Diff line
@@ -268,25 +268,6 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) 
	udelay(10);

	udelay(10);

}

}





static inline void twl4030_check_defaults(struct snd_soc_codec *codec)

{

	int i, difference = 0;

	u8 val;



	dev_dbg(codec->dev, "Checking TWL audio default configuration\n");

	for (i = 1; i <= TWL4030_REG_MISC_SET_2; i++) {

		twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, i);

		if (val != twl4030_reg[i]) {

			difference++;

			dev_dbg(codec->dev,

				 "Reg 0x%02x: chip: 0x%02x driver: 0x%02x\n",

				 i, val, twl4030_reg[i]);

		}

	}

	dev_dbg(codec->dev, "Found %d non-matching registers. %s\n",

		 difference, difference ? "Not OK" : "OK");

}



static inline void twl4030_reset_registers(struct snd_soc_codec *codec)

static inline void twl4030_reset_registers(struct snd_soc_codec *codec)

{

{

	int i;

	int i;
@@ -378,10 +359,6 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) 
		}

		}

	}

	}





	/* Check defaults, if instructed before anything else */

	if (pdata && pdata->check_defaults)

		twl4030_check_defaults(codec);



	/* Reset registers, if no setup data or if instructed to do so */

	/* Reset registers, if no setup data or if instructed to do so */

	if (!pdata || (pdata && pdata->reset_registers))

	if (!pdata || (pdata && pdata->reset_registers))

		twl4030_reset_registers(codec);

		twl4030_reset_registers(codec);