tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: simple-card-utils: Split simple_fixup_sample_fmt func

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2080908

Split the simple_fixup_sample_fmt() into two functions by adding
one more function named simple_util_get_sample_fmt() to return
the sample format value.

This is useful for drivers that wish to simply get the sample format
without setting the mask.

https://nvbugs/3896847

Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Link: https://msgid.link/r/20240527125608.2461300-2-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit 8cb3aeebcb86088e30232277c9bee9054837442b)
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Noah Wager <noah.wager@canonical.com>
Acked-by: Jacob Martin <jacob.martin@canonical.com>
Signed-off-by: Noah Wager <noah.wager@canonical.com>
This commit is contained in:
Mohan Kumar
2024-05-27 12:56:06 +00:00
committed by Noah Wager
parent 7e3e8d6fbf
commit f3709ea1c0
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/simple_card_utils.h
+2
View File
@@ -175,6 +175,8 @@ void simple_util_parse_convert(struct device_node *np, char *prefix,
struct simple_util_data *data);
bool simple_util_is_convert_required(const struct simple_util_data *data);
int simple_util_get_sample_fmt(struct simple_util_data *data);
int simple_util_parse_routing(struct snd_soc_card *card,
char *prefix);
int simple_util_parse_widgets(struct snd_soc_card *card,
sound/soc/generic/simple-card-utils.c
+20 -6
View File
@@ -13,12 +13,11 @@
#include <sound/pcm_params.h>
#include <sound/simple_card_utils.h>
static void simple_fixup_sample_fmt(struct simple_util_data *data,
struct snd_pcm_hw_params *params)
int simple_util_get_sample_fmt(struct simple_util_data *data)
{
int i;
struct snd_mask *mask = hw_param_mask(params,
SNDRV_PCM_HW_PARAM_FORMAT);
int val = -EINVAL;
struct {
char *fmt;
u32 val;
@@ -33,11 +32,26 @@ static void simple_fixup_sample_fmt(struct simple_util_data *data,
for (i = 0; i < ARRAY_SIZE(of_sample_fmt_table); i++) {
if (!strcmp(data->convert_sample_format,
of_sample_fmt_table[i].fmt)) {
snd_mask_none(mask);
snd_mask_set(mask, of_sample_fmt_table[i].val);
val = of_sample_fmt_table[i].val;
break;
}
}
return val;
}
EXPORT_SYMBOL_GPL(simple_util_get_sample_fmt);
static void simple_fixup_sample_fmt(struct simple_util_data *data,
struct snd_pcm_hw_params *params)
{
int val;
struct snd_mask *mask = hw_param_mask(params,
SNDRV_PCM_HW_PARAM_FORMAT);
val = simple_util_get_sample_fmt(data);
if (val >= 0) {
snd_mask_none(mask);
snd_mask_set(mask, val);
}
}
void simple_util_parse_convert(struct device_node *np,