From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dtor@mail.ru>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>
Cc: Tero Kristo <t-kristo@ti.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org,
Benoit Cousson <b-cousson@ti.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data
Date: Mon, 10 Sep 2012 13:46:29 +0300 [thread overview]
Message-ID: <1347273992-9107-12-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1347273992-9107-1-git-send-email-peter.ujfalusi@ti.com>
We no longer have users for the set_hs_extmute callback which has been
replaced by hs_extmute_gpio so the codec driver can handle the external
mute if it is needed by the board.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
include/linux/i2c/twl.h | 2 --
sound/soc/codecs/twl4030.c | 6 ------
2 files changed, 8 deletions(-)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 2040309..a4885a6 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -667,8 +667,6 @@ struct twl4030_codec_data {
unsigned int check_defaults:1;
unsigned int reset_registers:1;
unsigned int hs_extmute:1;
- void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and
- hs_extmute_disable_level */
int hs_extmute_gpio;
};
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 5fc271a..27ccea4 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -767,9 +767,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 1);
- } else if (pdata->set_hs_extmute) {
- dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
- pdata->set_hs_extmute(1);
} else {
hs_pop |= TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
@@ -808,9 +805,6 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
if (pdata && pdata->hs_extmute) {
if (gpio_is_valid(pdata->hs_extmute_gpio)) {
gpio_set_value(pdata->hs_extmute_gpio, 0);
- } else if (pdata->set_hs_extmute) {
- dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
- pdata->set_hs_extmute(0);
} else {
hs_pop &= ~TWL4030_EXTMUTE;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);
--
1.7.12
next prev parent reply other threads:[~2012-09-10 10:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 10:46 [PATCH v4 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 01/14] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 03/14] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 04/14] MFD: twl-core: Add API to query the HFCLK rate Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 05/14] MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 06/14] dt: Add empty of_find_node_by_name() function Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 07/14] MFD: twl4030-audio: Add DT support Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 08/14] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 09/14] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 10/14] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi
2012-09-10 10:46 ` Peter Ujfalusi [this message]
2012-09-10 10:46 ` [PATCH v4 12/14] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 13/14] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi
2012-09-10 10:46 ` [PATCH v4 14/14] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi
2012-09-19 0:24 ` [PATCH v4 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Samuel Ortiz
2012-09-19 8:34 ` Peter Ujfalusi
2012-09-22 15:19 ` 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=1347273992-9107-12-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dtor@mail.ru \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=rob.herring@calxeda.com \
--cc=sameo@linux.intel.com \
--cc=t-kristo@ti.com \
--cc=tony@atomide.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®