From: Mark Brown <broonie@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: alsa-devel@alsa-project.org, linaro-kernel@lists.linaro.org,
Mark Brown <broonie@linaro.org>
Subject: [PATCH 2/2] ASoC: io: Remove SND_SOC_I2C
Date: Thu, 20 Feb 2014 09:11:10 +0900 [thread overview]
Message-ID: <1392855070-27700-2-git-send-email-broonie@kernel.org> (raw)
In-Reply-To: <1392855070-27700-1-git-send-email-broonie@kernel.org>
From: Mark Brown <broonie@linaro.org>
Now that all users have been converted to regmap we can eliminate the ASoC
level wrapper for I2C I/O reducing the amount of duplicated functionality.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
include/sound/soc.h | 1 -
sound/soc/soc-io.c | 7 -------
2 files changed, 8 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 21038e0..de07934 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -355,7 +355,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_I2C = 1,
SND_SOC_REGMAP,
};
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 3a0d99e..add99e2 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -99,13 +99,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
config.val_bits = data_bits;
switch (control) {
-#if IS_ENABLED(CONFIG_REGMAP_I2C)
- case SND_SOC_I2C:
- codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
- &config);
- break;
-#endif
-
case SND_SOC_REGMAP:
/* Device has made its own regmap arrangements */
codec->using_regmap = true;
--
1.9.0.rc3
prev parent reply other threads:[~2014-02-20 0:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 0:11 [PATCH 1/2] ASoC: alc5623: Convert to direct regmap API usage Mark Brown
2014-02-20 0:11 ` Mark Brown [this message]
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=1392855070-27700-2-git-send-email-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.patard@rtp-net.org \
--cc=broonie@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linaro-kernel@lists.linaro.org \
/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