From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 05/11] ASoC: twl4030: Remove check defaults functionality
Date: Fri, 3 Jan 2014 15:27:50 +0200 [thread overview]
Message-ID: <1388755676-16036-6-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1388755676-16036-1-git-send-email-peter.ujfalusi@ti.com>
No need to keep the check defaults functionality anymore.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/i2c/twl.h | 1 -
sound/soc/codecs/twl4030.c | 23 -----------------------
2 files changed, 24 deletions(-)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index a09da0910339..2937a9472b94 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -670,7 +670,6 @@ struct twl4030_codec_data {
unsigned int digimic_delay; /* in ms */
unsigned int ramp_delay_value;
unsigned int offset_cncl_path;
- unsigned int check_defaults:1;
unsigned int reset_registers:1;
unsigned int hs_extmute:1;
int hs_extmute_gpio;
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 419108ae31de..7b732ab70d2c 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -268,25 +268,6 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
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)
{
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 */
if (!pdata || (pdata && pdata->reset_registers))
twl4030_reset_registers(codec);
--
1.8.5.2
next prev parent reply other threads:[~2014-01-03 13:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-03 13:27 [PATCH 00/11] ASoC/MFD: twl4030 codec local register cache removal Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 01/11] MFD: twl-core: Simplify IO wrapper functions by moving common code out Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 02/11] MFD: twl-core: API to set the regcache bypass for a given regmap in twl Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 03/11] MFD: twl-core: Enable regcache for audio registers Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 04/11] ASoC: twl4030: Separate write condition checking from I/O function Peter Ujfalusi
2014-01-03 13:27 ` Peter Ujfalusi [this message]
2014-01-03 13:27 ` [PATCH 06/11] ASoC: twl4030: Remove reset registers functionality Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 07/11] ASoC: twl4030: Introduce local ctl register cache Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 08/11] ASoC: twl4030: Remove local reg cache Peter Ujfalusi
2014-01-08 8:05 ` Lee Jones
2014-01-08 11:07 ` Peter Ujfalusi
2014-01-08 11:18 ` Lee Jones
2014-01-03 13:27 ` [PATCH 09/11] ASoC: twl4030: Parameter alignment fixes (for code consistency) Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 10/11] ASoC: twl4030: Move the ctl cache update local to twl4030_write() function Peter Ujfalusi
2014-01-03 13:27 ` [PATCH 11/11] ASoC: twl4030: Pass the twl4030_priv directly to twl4030_can_write_to_chip() Peter Ujfalusi
2014-01-06 13:19 ` [PATCH 00/11] ASoC/MFD: twl4030 codec local register cache removal Mark Brown
2014-01-06 16:10 ` Lee Jones
2014-01-06 16:31 ` Mark Brown
2014-01-08 11:42 ` Lee Jones
2014-01-08 12:48 ` Mark Brown
2014-01-08 13:29 ` Lee Jones
2014-01-08 12:49 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388755676-16036-6-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®