From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
Misael Lopez Cruz <misael.lopez@ti.com>
Subject: [PATCH 3/6] ASoC: twl6040: Simplify sample rate constraint handling
Date: Mon, 4 Jul 2011 13:05:55 +0300 [thread overview]
Message-ID: <1309773958-14608-4-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1309773958-14608-1-git-send-email-peter.ujfalusi@ti.com>
We can manage the sample rate constraints without the need
to maintain a variable and a pointer.
This simplifies the handling of the constraint, and makes it
more robust.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/codecs/twl6040.c | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index e61f32f..9229049 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -88,7 +88,6 @@ struct twl6040_data {
u16 hs_right_step;
u16 hf_left_step;
u16 hf_right_step;
- struct snd_pcm_hw_constraint_list *sysclk_constraints;
struct twl6040_jack_data hs_jack;
struct snd_soc_codec *codec;
struct workqueue_struct *workqueue;
@@ -223,11 +222,6 @@ static unsigned int lp_rates[] = {
96000,
};
-static struct snd_pcm_hw_constraint_list lp_constraints = {
- .count = ARRAY_SIZE(lp_rates),
- .list = lp_rates,
-};
-
static unsigned int hp_rates[] = {
8000,
16000,
@@ -236,9 +230,9 @@ static unsigned int hp_rates[] = {
96000,
};
-static struct snd_pcm_hw_constraint_list hp_constraints = {
- .count = ARRAY_SIZE(hp_rates),
- .list = hp_rates,
+static struct snd_pcm_hw_constraint_list sysclk_constraints[] = {
+ { .count = ARRAY_SIZE(lp_rates), .list = lp_rates, },
+ { .count = ARRAY_SIZE(hp_rates), .list = hp_rates, },
};
/*
@@ -1098,10 +1092,6 @@ static int twl6040_pll_put_enum(struct snd_kcontrol *kcontrol,
struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
priv->pll_power_mode = ucontrol->value.enumerated.item[0];
- if (priv->pll_power_mode)
- priv->sysclk_constraints = &hp_constraints;
- else
- priv->sysclk_constraints = &lp_constraints;
return 0;
}
@@ -1369,7 +1359,7 @@ static int twl6040_startup(struct snd_pcm_substream *substream,
snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE,
- priv->sysclk_constraints);
+ &sysclk_constraints[priv->pll_power_mode]);
return 0;
}
@@ -1589,7 +1579,6 @@ static int twl6040_probe(struct snd_soc_codec *codec)
priv->hf_right_step = 1;
}
- priv->sysclk_constraints = &lp_constraints;
priv->workqueue = create_singlethread_workqueue("twl6040-codec");
if (!priv->workqueue) {
ret = -ENOMEM;
--
1.7.6
next prev parent reply other threads:[~2011-07-04 10:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-04 10:05 [PATCH 0/6] ASoC/MFD: twl6040: PLL handling changes Peter Ujfalusi
2011-07-04 10:05 ` [PATCH 1/6] ASoC: twl6040: Use neutral name for power mode text/enum Peter Ujfalusi
2011-07-04 10:05 ` [PATCH 2/6] ASoC: twl6040: Move PLL selection to codec driver Peter Ujfalusi
2011-07-04 10:05 ` Peter Ujfalusi [this message]
2011-07-04 10:05 ` [PATCH 4/6] ASoC: twl6040: Configure PLL only once Peter Ujfalusi
2011-07-04 10:05 ` [PATCH 5/6] MFD: twl6040: Remove enum for PLL tracking Peter Ujfalusi
2011-07-06 18:31 ` Samuel Ortiz
2011-07-04 10:05 ` [PATCH 6/6] ASoC: twl6040: No need to convert the PLL ID Peter Ujfalusi
2011-07-04 17:46 ` Mark Brown
2011-07-06 5:47 ` [alsa-devel] [PATCH 0/6] ASoC/MFD: twl6040: PLL handling changes Péter Ujfalusi
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=1309773958-14608-4-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@ti.com \
--cc=misael.lopez@ti.com \
--cc=sameo@linux.intel.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®