From: Sameer Pujar <spujar@nvidia.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>, <perex@perex.cz>,
<tiwai@suse.com>
Cc: <thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
<alsa-devel@alsa-project.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH v3 02/16] ASoC: tegra: Fix wrong value type in I2S
Date: Thu, 18 Nov 2021 12:36:57 +0530 [thread overview]
Message-ID: <1637219231-406-3-git-send-email-spujar@nvidia.com> (raw)
In-Reply-To: <1637219231-406-1-git-send-email-spujar@nvidia.com>
The enum controls are expected to use enumerated value type.
Update relevant references in control get/put callbacks.
Fixes: c0bfa98349d1 ("ASoC: tegra: Add Tegra210 based I2S driver")
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
sound/soc/tegra/tegra210_i2s.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
index 45f31cc..5c30461 100644
--- a/sound/soc/tegra/tegra210_i2s.c
+++ b/sound/soc/tegra/tegra210_i2s.c
@@ -317,24 +317,27 @@ static int tegra210_i2s_get_control(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *compnt = snd_soc_kcontrol_component(kcontrol);
struct tegra210_i2s *i2s = snd_soc_component_get_drvdata(compnt);
- long *uctl_val = &ucontrol->value.integer.value[0];
if (strstr(kcontrol->id.name, "Loopback"))
- *uctl_val = i2s->loopback;
+ ucontrol->value.integer.value[0] = i2s->loopback;
else if (strstr(kcontrol->id.name, "FSYNC Width"))
- *uctl_val = i2s->fsync_width;
+ ucontrol->value.integer.value[0] = i2s->fsync_width;
else if (strstr(kcontrol->id.name, "Capture Stereo To Mono"))
- *uctl_val = i2s->stereo_to_mono[I2S_TX_PATH];
+ ucontrol->value.enumerated.item[0] =
+ i2s->stereo_to_mono[I2S_TX_PATH];
else if (strstr(kcontrol->id.name, "Capture Mono To Stereo"))
- *uctl_val = i2s->mono_to_stereo[I2S_TX_PATH];
+ ucontrol->value.enumerated.item[0] =
+ i2s->mono_to_stereo[I2S_TX_PATH];
else if (strstr(kcontrol->id.name, "Playback Stereo To Mono"))
- *uctl_val = i2s->stereo_to_mono[I2S_RX_PATH];
+ ucontrol->value.enumerated.item[0] =
+ i2s->stereo_to_mono[I2S_RX_PATH];
else if (strstr(kcontrol->id.name, "Playback Mono To Stereo"))
- *uctl_val = i2s->mono_to_stereo[I2S_RX_PATH];
+ ucontrol->value.enumerated.item[0] =
+ i2s->mono_to_stereo[I2S_RX_PATH];
else if (strstr(kcontrol->id.name, "Playback FIFO Threshold"))
- *uctl_val = i2s->rx_fifo_th;
+ ucontrol->value.integer.value[0] = i2s->rx_fifo_th;
else if (strstr(kcontrol->id.name, "BCLK Ratio"))
- *uctl_val = i2s->bclk_ratio;
+ ucontrol->value.integer.value[0] = i2s->bclk_ratio;
return 0;
}
@@ -344,10 +347,9 @@ static int tegra210_i2s_put_control(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *compnt = snd_soc_kcontrol_component(kcontrol);
struct tegra210_i2s *i2s = snd_soc_component_get_drvdata(compnt);
- int value = ucontrol->value.integer.value[0];
if (strstr(kcontrol->id.name, "Loopback")) {
- i2s->loopback = value;
+ i2s->loopback = ucontrol->value.integer.value[0];
regmap_update_bits(i2s->regmap, TEGRA210_I2S_CTRL,
I2S_CTRL_LPBK_MASK,
@@ -362,24 +364,28 @@ static int tegra210_i2s_put_control(struct snd_kcontrol *kcontrol,
* cases mixer control is used to update custom values. A value
* of "N" here means, width is "N + 1" bit clock wide.
*/
- i2s->fsync_width = value;
+ i2s->fsync_width = ucontrol->value.integer.value[0];
regmap_update_bits(i2s->regmap, TEGRA210_I2S_CTRL,
I2S_CTRL_FSYNC_WIDTH_MASK,
i2s->fsync_width << I2S_FSYNC_WIDTH_SHIFT);
} else if (strstr(kcontrol->id.name, "Capture Stereo To Mono")) {
- i2s->stereo_to_mono[I2S_TX_PATH] = value;
+ i2s->stereo_to_mono[I2S_TX_PATH] =
+ ucontrol->value.enumerated.item[0];
} else if (strstr(kcontrol->id.name, "Capture Mono To Stereo")) {
- i2s->mono_to_stereo[I2S_TX_PATH] = value;
+ i2s->mono_to_stereo[I2S_TX_PATH] =
+ ucontrol->value.enumerated.item[0];
} else if (strstr(kcontrol->id.name, "Playback Stereo To Mono")) {
- i2s->stereo_to_mono[I2S_RX_PATH] = value;
+ i2s->stereo_to_mono[I2S_RX_PATH] =
+ ucontrol->value.enumerated.item[0];
} else if (strstr(kcontrol->id.name, "Playback Mono To Stereo")) {
- i2s->mono_to_stereo[I2S_RX_PATH] = value;
+ i2s->mono_to_stereo[I2S_RX_PATH] =
+ ucontrol->value.enumerated.item[0];
} else if (strstr(kcontrol->id.name, "Playback FIFO Threshold")) {
- i2s->rx_fifo_th = value;
+ i2s->rx_fifo_th = ucontrol->value.integer.value[0];
} else if (strstr(kcontrol->id.name, "BCLK Ratio")) {
- i2s->bclk_ratio = value;
+ i2s->bclk_ratio = ucontrol->value.integer.value[0];
}
return 0;
--
2.7.4
next prev parent reply other threads:[~2021-11-18 7:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 7:06 [PATCH v3 00/16] Kcontrol get/put cleanup in Tegra drivers Sameer Pujar
2021-11-18 7:06 ` [PATCH v3 01/16] ASoC: tegra: Fix wrong value type in ADMAIF Sameer Pujar
2021-11-18 7:06 ` Sameer Pujar [this message]
2021-11-18 7:06 ` [PATCH v3 03/16] ASoC: tegra: Fix wrong value type in DMIC Sameer Pujar
2021-11-18 7:06 ` [PATCH v3 04/16] ASoC: tegra: Fix wrong value type in DSPK Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 05/16] ASoC: tegra: Fix wrong value type in SFC Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 06/16] ASoC: tegra: Fix wrong value type in MVC Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 07/16] ASoC: tegra: Fix kcontrol put callback in ADMAIF Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 08/16] ASoC: tegra: Fix kcontrol put callback in I2S Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 09/16] ASoC: tegra: Fix kcontrol put callback in DMIC Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 10/16] ASoC: tegra: Fix kcontrol put callback in DSPK Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 11/16] ASoC: tegra: Fix kcontrol put callback in AHUB Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 12/16] ASoC: tegra: Fix kcontrol put callback in MVC Sameer Pujar
2021-11-18 13:32 ` Takashi Iwai
2021-11-18 13:49 ` Mark Brown
2021-11-18 7:07 ` [PATCH v3 13/16] ASoC: tegra: Fix kcontrol put callback in SFC Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 14/16] ASoC: tegra: Fix kcontrol put callback in AMX Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 15/16] ASoC: tegra: Fix kcontrol put callback in ADX Sameer Pujar
2021-11-18 7:07 ` [PATCH v3 16/16] ASoC: tegra: Fix kcontrol put callback in Mixer Sameer Pujar
2021-11-18 13:33 ` [PATCH v3 00/16] Kcontrol get/put cleanup in Tegra drivers Takashi Iwai
2021-11-18 19:06 ` 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=1637219231-406-3-git-send-email-spujar@nvidia.com \
--to=spujar@nvidia.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jonathanh@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=perex@perex.cz \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.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;
as well as URLs for NNTP newsgroup(s).