Commit 933f98be authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: constify of_phandle_args in snd_soc_get_dai_name()

The pointer to of_phandle_args passed to snd_soc_get_dai_name() and
of_xlate_dai_name() implementations is not modified.  Since it is being
used only to translate passed OF node to a DAI name, it should not be
modified, so mark it as const for correctness and safer code.
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20210221153024.453583-1-krzk@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e92a309b
...@@ -101,7 +101,7 @@ struct snd_soc_component_driver { ...@@ -101,7 +101,7 @@ struct snd_soc_component_driver {
/* DT */ /* DT */
int (*of_xlate_dai_name)(struct snd_soc_component *component, int (*of_xlate_dai_name)(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name); const char **dai_name);
int (*of_xlate_dai_id)(struct snd_soc_component *comment, int (*of_xlate_dai_id)(struct snd_soc_component *comment,
struct device_node *endpoint); struct device_node *endpoint);
...@@ -450,7 +450,7 @@ void snd_soc_component_remove(struct snd_soc_component *component); ...@@ -450,7 +450,7 @@ void snd_soc_component_remove(struct snd_soc_component *component);
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component, int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
struct device_node *ep); struct device_node *ep);
int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name); const char **dai_name);
int snd_soc_component_compr_open(struct snd_compr_stream *cstream); int snd_soc_component_compr_open(struct snd_compr_stream *cstream);
void snd_soc_component_compr_free(struct snd_compr_stream *cstream, void snd_soc_component_compr_free(struct snd_compr_stream *cstream,
......
...@@ -1219,7 +1219,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, ...@@ -1219,7 +1219,7 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
struct device_node **bitclkmaster, struct device_node **bitclkmaster,
struct device_node **framemaster); struct device_node **framemaster);
int snd_soc_get_dai_id(struct device_node *ep); int snd_soc_get_dai_id(struct device_node *ep);
int snd_soc_get_dai_name(struct of_phandle_args *args, int snd_soc_get_dai_name(const struct of_phandle_args *args,
const char **dai_name); const char **dai_name);
int snd_soc_of_get_dai_name(struct device_node *of_node, int snd_soc_of_get_dai_name(struct device_node *of_node,
const char **dai_name); const char **dai_name);
......
...@@ -159,7 +159,7 @@ static const struct snd_kcontrol_new aiu_acodec_ctrl_controls[] = { ...@@ -159,7 +159,7 @@ static const struct snd_kcontrol_new aiu_acodec_ctrl_controls[] = {
}; };
static int aiu_acodec_of_xlate_dai_name(struct snd_soc_component *component, static int aiu_acodec_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
return aiu_of_xlate_dai_name(component, args, dai_name, AIU_ACODEC); return aiu_of_xlate_dai_name(component, args, dai_name, AIU_ACODEC);
......
...@@ -125,7 +125,7 @@ static const struct snd_soc_dapm_route aiu_hdmi_ctrl_routes[] = { ...@@ -125,7 +125,7 @@ static const struct snd_soc_dapm_route aiu_hdmi_ctrl_routes[] = {
}; };
static int aiu_hdmi_of_xlate_dai_name(struct snd_soc_component *component, static int aiu_hdmi_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
return aiu_of_xlate_dai_name(component, args, dai_name, AIU_HDMI); return aiu_of_xlate_dai_name(component, args, dai_name, AIU_HDMI);
......
...@@ -42,7 +42,7 @@ static const struct snd_soc_dapm_route aiu_cpu_dapm_routes[] = { ...@@ -42,7 +42,7 @@ static const struct snd_soc_dapm_route aiu_cpu_dapm_routes[] = {
}; };
int aiu_of_xlate_dai_name(struct snd_soc_component *component, int aiu_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name, const char **dai_name,
unsigned int component_id) unsigned int component_id)
{ {
...@@ -72,7 +72,7 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component, ...@@ -72,7 +72,7 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component,
} }
static int aiu_cpu_of_xlate_dai_name(struct snd_soc_component *component, static int aiu_cpu_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
return aiu_of_xlate_dai_name(component, args, dai_name, AIU_CPU); return aiu_of_xlate_dai_name(component, args, dai_name, AIU_CPU);
......
...@@ -45,7 +45,7 @@ struct aiu { ...@@ -45,7 +45,7 @@ struct aiu {
SNDRV_PCM_FMTBIT_S24_LE) SNDRV_PCM_FMTBIT_S24_LE)
int aiu_of_xlate_dai_name(struct snd_soc_component *component, int aiu_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name, const char **dai_name,
unsigned int component_id); unsigned int component_id);
......
...@@ -340,7 +340,7 @@ int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai) ...@@ -340,7 +340,7 @@ int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai)
EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_probe); EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_probe);
static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component, static int asoc_qcom_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);
......
...@@ -1315,7 +1315,7 @@ static struct snd_soc_dai_driver q6afe_dais[] = { ...@@ -1315,7 +1315,7 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
}; };
static int q6afe_of_xlate_dai_name(struct snd_soc_component *component, static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
int id = args->args[0]; int id = args->args[0];
......
...@@ -370,7 +370,7 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component, ...@@ -370,7 +370,7 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
} }
int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
struct of_phandle_args *args, const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
if (component->driver->of_xlate_dai_name) if (component->driver->of_xlate_dai_name)
......
...@@ -2998,7 +2998,7 @@ int snd_soc_get_dai_id(struct device_node *ep) ...@@ -2998,7 +2998,7 @@ int snd_soc_get_dai_id(struct device_node *ep)
} }
EXPORT_SYMBOL_GPL(snd_soc_get_dai_id); EXPORT_SYMBOL_GPL(snd_soc_get_dai_id);
int snd_soc_get_dai_name(struct of_phandle_args *args, int snd_soc_get_dai_name(const struct of_phandle_args *args,
const char **dai_name) const char **dai_name)
{ {
struct snd_soc_component *pos; struct snd_soc_component *pos;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment