public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: SDCA: Move SDCA search functions and export

Browse source 
The ASoC code for SDCA contains several helper functions that search for
controls/ranges/etc. As the code evolves these helpers are likely to be
useful to anything interacting with the stored DisCo data. Move the
helpers into sdca_function.c and export them so other modules can also
use them.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20250707124155.2596744-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2025-07-07 13:41:51 +01:00 • committed by Mark Brown
parent cbcb5f5c2b
commit c57ad86246
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
3 changed files with 74 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/sound/sdca_function.h
View file

@ -1316,4 +1316,15 @@ int sdca_parse_function(struct device *dev,
struct sdca_function_desc *desc,
struct sdca_function_data *function);
struct sdca_control *sdca_selector_find_control(struct device *dev,
struct sdca_entity *entity,
const int sel);
struct sdca_control_range *sdca_control_find_range(struct device *dev,
struct sdca_entity *entity,
struct sdca_control *control,
int cols, int rows);
struct sdca_control_range *sdca_selector_find_range(struct device *dev,
struct sdca_entity *entity,
int sel, int cols, int rows);
#endif

73
sound/soc/sdca/sdca_asoc.c
View file

@ -26,53 +26,6 @@
#include <sound/soc-dapm.h>
#include <sound/tlv.h>
static struct sdca_control *selector_find_control(struct device *dev,
struct sdca_entity *entity,
const int sel)
{
int i;
for (i = 0; i < entity->num_controls; i++) {
struct sdca_control *control = &entity->controls[i];
if (control->sel == sel)
return control;
}
dev_err(dev, "%s: control %#x: missing\n", entity->label, sel);
return NULL;
}
static struct sdca_control_range *control_find_range(struct device *dev,
struct sdca_entity *entity,
struct sdca_control *control,
int cols, int rows)
{
struct sdca_control_range *range = &control->range;
if ((cols && range->cols != cols) || (rows && range->rows != rows) ||
!range->data) {
dev_err(dev, "%s: control %#x: ranges invalid (%d,%d)\n",
entity->label, control->sel, range->cols, range->rows);
return NULL;
}
return range;
}
static struct sdca_control_range *selector_find_range(struct device *dev,
struct sdca_entity *entity,
int sel, int cols, int rows)
{
struct sdca_control *control;
control = selector_find_control(dev, entity, sel);
if (!control)
return NULL;
return control_find_range(dev, entity, control, cols, rows);
}
static bool exported_control(struct sdca_entity *entity, struct sdca_control *control)
{
switch (SDCA_CTL_TYPE(entity->type, control->sel)) {
@ -213,7 +166,7 @@ static int entity_early_parse_ge(struct device *dev,
const char **texts;
int i;
control = selector_find_control(dev, entity, SDCA_CTL_GE_SELECTED_MODE);
control = sdca_selector_find_control(dev, entity, SDCA_CTL_GE_SELECTED_MODE);
if (!control)
return -EINVAL;
@ -221,7 +174,7 @@ static int entity_early_parse_ge(struct device *dev,
dev_warn(dev, "%s: unexpected access layer: %x\n",
entity->label, control->layers);
range = control_find_range(dev, entity, control, SDCA_SELECTED_MODE_NCOLS, 0);
range = sdca_control_find_range(dev, entity, control, SDCA_SELECTED_MODE_NCOLS, 0);
if (!range)
return -EINVAL;
@ -443,7 +396,7 @@ static int entity_parse_pde(struct device *dev,
unsigned int mask = 0;
int i;
control = selector_find_control(dev, entity, SDCA_CTL_PDE_REQUESTED_PS);
control = sdca_selector_find_control(dev, entity, SDCA_CTL_PDE_REQUESTED_PS);
if (!control)
return -EINVAL;
@ -452,7 +405,7 @@ static int entity_parse_pde(struct device *dev,
dev_warn(dev, "%s: unexpected access layer: %x\n",
entity->label, control->layers);
range = control_find_range(dev, entity, control, SDCA_REQUESTED_PS_NCOLS, 0);
range = sdca_control_find_range(dev, entity, control, SDCA_REQUESTED_PS_NCOLS, 0);
if (!range)
return -EINVAL;
@ -499,8 +452,8 @@ static int entity_parse_su_device(struct device *dev,
return -EINVAL;
}
range = selector_find_range(dev, entity->group, SDCA_CTL_GE_SELECTED_MODE,
SDCA_SELECTED_MODE_NCOLS, 0);
range = sdca_selector_find_range(dev, entity->group, SDCA_CTL_GE_SELECTED_MODE,
SDCA_SELECTED_MODE_NCOLS, 0);
if (!range)
return -EINVAL;
@ -613,7 +566,7 @@ static int entity_parse_su(struct device *dev,
return -EINVAL;
}
control = selector_find_control(dev, entity, SDCA_CTL_SU_SELECTOR);
control = sdca_selector_find_control(dev, entity, SDCA_CTL_SU_SELECTOR);
if (!control)
return -EINVAL;
@ -643,7 +596,7 @@ static int entity_parse_mu(struct device *dev,
return -EINVAL;
}
control = selector_find_control(dev, entity, SDCA_CTL_MU_MIXER);
control = sdca_selector_find_control(dev, entity, SDCA_CTL_MU_MIXER);
if (!control)
return -EINVAL;
@ -853,7 +806,7 @@ static int control_limit_kctl(struct device *dev,
/*
* FIXME: For now only handle the simple case of a single linear range
*/
range = control_find_range(dev, entity, control, SDCA_VOLUME_LINEAR_NCOLS, 1);
range = sdca_control_find_range(dev, entity, control, SDCA_VOLUME_LINEAR_NCOLS, 1);
if (!range)
return -EINVAL;
@ -1140,9 +1093,9 @@ static int populate_rate_format(struct device *dev,
}
if (entity->iot.clock) {
range = selector_find_range(dev, entity->iot.clock,
SDCA_CTL_CS_SAMPLERATEINDEX,
SDCA_SAMPLERATEINDEX_NCOLS, 0);
range = sdca_selector_find_range(dev, entity->iot.clock,
SDCA_CTL_CS_SAMPLERATEINDEX,
SDCA_SAMPLERATEINDEX_NCOLS, 0);
if (!range)
return -EINVAL;
@ -1154,7 +1107,7 @@ static int populate_rate_format(struct device *dev,
clock_rates = UINT_MAX;
}
range = selector_find_range(dev, entity, sel, SDCA_USAGE_NCOLS, 0);
range = sdca_selector_find_range(dev, entity, sel, SDCA_USAGE_NCOLS, 0);
if (!range)
return -EINVAL;

50
sound/soc/sdca/sdca_functions.c
View file

@ -1941,5 +1941,55 @@ int sdca_parse_function(struct device *dev,
}
EXPORT_SYMBOL_NS(sdca_parse_function, "SND_SOC_SDCA");
struct sdca_control *sdca_selector_find_control(struct device *dev,
struct sdca_entity *entity,
const int sel)
{
int i;
for (i = 0; i < entity->num_controls; i++) {
struct sdca_control *control = &entity->controls[i];
if (control->sel == sel)
return control;
}
dev_err(dev, "%s: control %#x: missing\n", entity->label, sel);
return NULL;
}
EXPORT_SYMBOL_NS(sdca_selector_find_control, "SND_SOC_SDCA");
struct sdca_control_range *sdca_control_find_range(struct device *dev,
struct sdca_entity *entity,
struct sdca_control *control,
int cols, int rows)
{
struct sdca_control_range *range = &control->range;
if ((cols && range->cols != cols) || (rows && range->rows != rows) ||
!range->data) {
dev_err(dev, "%s: control %#x: ranges invalid (%d,%d)\n",
entity->label, control->sel, range->cols, range->rows);
return NULL;
}
return range;
}
EXPORT_SYMBOL_NS(sdca_control_find_range, "SND_SOC_SDCA");
struct sdca_control_range *sdca_selector_find_range(struct device *dev,
struct sdca_entity *entity,
int sel, int cols, int rows)
{
struct sdca_control *control;
control = sdca_selector_find_control(dev, entity, sel);
if (!control)
return NULL;
return sdca_control_find_range(dev, entity, control, cols, rows);
}
EXPORT_SYMBOL_NS(sdca_selector_find_range, "SND_SOC_SDCA");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("SDCA library");