[v3,04/16] ASoC: tegra: Fix wrong value type in DSPK

Message ID	1637219231-406-5-git-send-email-spujar@nvidia.com
State	Accepted
Headers	show Return-Path: <linux-tegra-owner@vger.kernel.org> Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; 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 04/16] ASoC: tegra: Fix wrong value type in DSPK Date: Thu, 18 Nov 2021 12:36:59 +0530 Message-ID: <1637219231-406-5-git-send-email-spujar@nvidia.com> In-Reply-To: <1637219231-406-1-git-send-email-spujar@nvidia.com> References: <1637219231-406-1-git-send-email-spujar@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk
Series	Kcontrol get/put cleanup in Tegra drivers \| expand [v3,00/16] Kcontrol get/put cleanup in Tegra drivers [v3,01/16] ASoC: tegra: Fix wrong value type in ADMAIF [v3,02/16] ASoC: tegra: Fix wrong value type in I2S [v3,03/16] ASoC: tegra: Fix wrong value type in DMIC [v3,04/16] ASoC: tegra: Fix wrong value type in DSPK [v3,05/16] ASoC: tegra: Fix wrong value type in SFC [v3,06/16] ASoC: tegra: Fix wrong value type in MVC [v3,07/16] ASoC: tegra: Fix kcontrol put callback in ADMAIF [v3,08/16] ASoC: tegra: Fix kcontrol put callback in I2S [v3,09/16] ASoC: tegra: Fix kcontrol put callback in DMIC [v3,10/16] ASoC: tegra: Fix kcontrol put callback in DSPK [v3,11/16] ASoC: tegra: Fix kcontrol put callback in AHUB [v3,12/16] ASoC: tegra: Fix kcontrol put callback in MVC [v3,13/16] ASoC: tegra: Fix kcontrol put callback in SFC [v3,14/16] ASoC: tegra: Fix kcontrol put callback in AMX [v3,15/16] ASoC: tegra: Fix kcontrol put callback in ADX [v3,16/16] ASoC: tegra: Fix kcontrol put callback in Mixer

Message ID

1637219231-406-5-git-send-email-spujar@nvidia.com

State

Accepted

Headers

Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
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 04/16] ASoC: tegra: Fix wrong value type in DSPK
Date: Thu, 18 Nov 2021 12:36:59 +0530
Message-ID: <1637219231-406-5-git-send-email-spujar@nvidia.com>
In-Reply-To: <1637219231-406-1-git-send-email-spujar@nvidia.com>
References: <1637219231-406-1-git-send-email-spujar@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2021 07:07:40.1309
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 ad279f0e-a07d-4a25-1fd6-08d9aa621c01
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: 
 TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: 
 BN8NAM11FT005.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1716
Precedence: bulk
List-ID: <linux-tegra.vger.kernel.org>
X-Mailing-List: linux-tegra@vger.kernel.org

Series

Kcontrol get/put cleanup in Tegra drivers | expand

Commit Message

Sameer Pujar Nov. 18, 2021, 7:06 a.m. UTC

The enum controls are expected to use enumerated value type.
Update relevant references in control get/put callbacks.

Fixes: 327ef6470266 ("ASoC: tegra: Add Tegra186 based DSPK driver")
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
 sound/soc/tegra/tegra186_dspk.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
index 8ee9a77..67269e7 100644
--- a/sound/soc/tegra/tegra186_dspk.c
+++ b/sound/soc/tegra/tegra186_dspk.c
@@ -35,15 +35,15 @@  static int tegra186_dspk_get_control(struct snd_kcontrol *kcontrol,
 	if (strstr(kcontrol->id.name, "FIFO Threshold"))
 		ucontrol->value.integer.value[0] = dspk->rx_fifo_th;
 	else if (strstr(kcontrol->id.name, "OSR Value"))
-		ucontrol->value.integer.value[0] = dspk->osr_val;
+		ucontrol->value.enumerated.item[0] = dspk->osr_val;
 	else if (strstr(kcontrol->id.name, "LR Polarity Select"))
-		ucontrol->value.integer.value[0] = dspk->lrsel;
+		ucontrol->value.enumerated.item[0] = dspk->lrsel;
 	else if (strstr(kcontrol->id.name, "Channel Select"))
-		ucontrol->value.integer.value[0] = dspk->ch_sel;
+		ucontrol->value.enumerated.item[0] = dspk->ch_sel;
 	else if (strstr(kcontrol->id.name, "Mono To Stereo"))
-		ucontrol->value.integer.value[0] = dspk->mono_to_stereo;
+		ucontrol->value.enumerated.item[0] = dspk->mono_to_stereo;
 	else if (strstr(kcontrol->id.name, "Stereo To Mono"))
-		ucontrol->value.integer.value[0] = dspk->stereo_to_mono;
+		ucontrol->value.enumerated.item[0] = dspk->stereo_to_mono;
 
 	return 0;
 }
@@ -53,20 +53,19 @@  static int tegra186_dspk_put_control(struct snd_kcontrol *kcontrol,
 {
 	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
 	struct tegra186_dspk *dspk = snd_soc_component_get_drvdata(codec);
-	int val = ucontrol->value.integer.value[0];
 
 	if (strstr(kcontrol->id.name, "FIFO Threshold"))
-		dspk->rx_fifo_th = val;
+		dspk->rx_fifo_th = ucontrol->value.integer.value[0];
 	else if (strstr(kcontrol->id.name, "OSR Value"))
-		dspk->osr_val = val;
+		dspk->osr_val = ucontrol->value.enumerated.item[0];
 	else if (strstr(kcontrol->id.name, "LR Polarity Select"))
-		dspk->lrsel = val;
+		dspk->lrsel = ucontrol->value.enumerated.item[0];
 	else if (strstr(kcontrol->id.name, "Channel Select"))
-		dspk->ch_sel = val;
+		dspk->ch_sel = ucontrol->value.enumerated.item[0];
 	else if (strstr(kcontrol->id.name, "Mono To Stereo"))
-		dspk->mono_to_stereo = val;
+		dspk->mono_to_stereo = ucontrol->value.enumerated.item[0];
 	else if (strstr(kcontrol->id.name, "Stereo To Mono"))
-		dspk->stereo_to_mono = val;
+		dspk->stereo_to_mono = ucontrol->value.enumerated.item[0];
 
 	return 0;
 }

[v3,04/16] ASoC: tegra: Fix wrong value type in DSPK

Commit Message

Patch