Skip to content

L
linux
Commit ad11e59f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: simple-card-utils: rename asoc_simple_card_xxx() to asoc_simple_() 

Current simple-card-utils is using asoc_simple_card_xxx() for each
function naming, but it is very verbose.
Thus it is easy to be over 80 char.
This patch renames it to asoc_simple_xxx().
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8f7f298a
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 204 deletions
include/sound/simple_card_utils.h
View file @ ad11e59f
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include <sound/soc.h> #include <sound/soc.h>
#define asoc_simple_card_init_hp(card, sjack, prefix) \ #define asoc_simple_init_hp(card, sjack, prefix) \
asoc_simple_card_init_jack(card, sjack, 1, prefix) asoc_simple_init_jack(card, sjack, 1, prefix)
#define asoc_simple_card_init_mic(card, sjack, prefix) \ #define asoc_simple_init_mic(card, sjack, prefix) \
asoc_simple_card_init_jack(card, sjack, 0, prefix) asoc_simple_init_jack(card, sjack, 0, prefix)
struct asoc_simple_dai { struct asoc_simple_dai {
const char *name; const char *name;
...@@ -26,7 +26,7 @@ struct asoc_simple_dai { ...@@ -26,7 +26,7 @@ struct asoc_simple_dai {
struct clk *clk; struct clk *clk;
}; };
struct asoc_simple_card_data { struct asoc_simple_data {
u32 convert_rate; u32 convert_rate;
u32 convert_channels; u32 convert_channels;
}; };
...@@ -44,7 +44,7 @@ struct asoc_simple_priv { ...@@ -44,7 +44,7 @@ struct asoc_simple_priv {
struct asoc_simple_dai *codec_dai; struct asoc_simple_dai *codec_dai;
struct snd_soc_dai_link_component codecs; /* single codec */ struct snd_soc_dai_link_component codecs; /* single codec */
struct snd_soc_dai_link_component platforms; struct snd_soc_dai_link_component platforms;
struct asoc_simple_card_data adata; struct asoc_simple_data adata;
struct snd_soc_codec_conf *codec_conf; struct snd_soc_codec_conf *codec_conf;
unsigned int mclk_fs; unsigned int mclk_fs;
} *dai_props; } *dai_props;
...@@ -67,30 +67,30 @@ struct link_info { ...@@ -67,30 +67,30 @@ struct link_info {
int cpu; /* turn for CPU / Codec */ int cpu; /* turn for CPU / Codec */
}; };
int asoc_simple_card_parse_daifmt(struct device *dev, int asoc_simple_parse_daifmt(struct device *dev,
struct device_node *node, struct device_node *node,
struct device_node *codec, struct device_node *codec,
char *prefix, char *prefix,
unsigned int *retfmt); unsigned int *retfmt);
__printf(3, 4) __printf(3, 4)
int asoc_simple_card_set_dailink_name(struct device *dev, int asoc_simple_set_dailink_name(struct device *dev,
struct snd_soc_dai_link *dai_link, struct snd_soc_dai_link *dai_link,
const char *fmt, ...); const char *fmt, ...);
int asoc_simple_card_parse_card_name(struct snd_soc_card *card, int asoc_simple_parse_card_name(struct snd_soc_card *card,
char *prefix); char *prefix);
#define asoc_simple_card_parse_clk_cpu(dev, node, dai_link, simple_dai) \ #define asoc_simple_parse_clk_cpu(dev, node, dai_link, simple_dai) \
asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai, \ asoc_simple_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai, \
dai_link->cpu_dai_name, NULL) dai_link->cpu_dai_name, NULL)
#define asoc_simple_card_parse_clk_codec(dev, node, dai_link, simple_dai) \ #define asoc_simple_parse_clk_codec(dev, node, dai_link, simple_dai) \
asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai,\ asoc_simple_parse_clk(dev, node, dai_link->codec_of_node, simple_dai,\
dai_link->codec_dai_name, dai_link->codecs) dai_link->codec_dai_name, dai_link->codecs)
int asoc_simple_card_parse_clk(struct device *dev, int asoc_simple_parse_clk(struct device *dev,
struct device_node *node, struct device_node *node,
struct device_node *dai_of_node, struct device_node *dai_of_node,
struct asoc_simple_dai *simple_dai, struct asoc_simple_dai *simple_dai,
const char *dai_name, const char *dai_name,
struct snd_soc_dai_link_component *dlc); struct snd_soc_dai_link_component *dlc);
int asoc_simple_startup(struct snd_pcm_substream *substream); int asoc_simple_startup(struct snd_pcm_substream *substream);
void asoc_simple_shutdown(struct snd_pcm_substream *substream); void asoc_simple_shutdown(struct snd_pcm_substream *substream);
int asoc_simple_hw_params(struct snd_pcm_substream *substream, int asoc_simple_hw_params(struct snd_pcm_substream *substream,
...@@ -99,45 +99,45 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd); ...@@ -99,45 +99,45 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd);
int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params); struct snd_pcm_hw_params *params);
#define asoc_simple_card_parse_cpu(node, dai_link, is_single_link) \ #define asoc_simple_parse_cpu(node, dai_link, is_single_link) \
asoc_simple_card_parse_dai(node, NULL, \ asoc_simple_parse_dai(node, NULL, \
&dai_link->cpu_of_node, \ &dai_link->cpu_of_node, \
&dai_link->cpu_dai_name, is_single_link) &dai_link->cpu_dai_name, is_single_link)
#define asoc_simple_card_parse_codec(node, dai_link) \ #define asoc_simple_parse_codec(node, dai_link) \
asoc_simple_card_parse_dai(node, dai_link->codecs, \ asoc_simple_parse_dai(node, dai_link->codecs, \
&dai_link->codec_of_node, \ &dai_link->codec_of_node, \
&dai_link->codec_dai_name, NULL) &dai_link->codec_dai_name, NULL)
#define asoc_simple_card_parse_platform(node, dai_link) \ #define asoc_simple_parse_platform(node, dai_link) \
asoc_simple_card_parse_dai(node, dai_link->platforms, \ asoc_simple_parse_dai(node, dai_link->platforms, \
&dai_link->platform_of_node, NULL, NULL) &dai_link->platform_of_node, NULL, NULL)
#define asoc_simple_card_of_parse_tdm(np, dai) \ #define asoc_simple_parse_tdm(np, dai) \
snd_soc_of_parse_tdm_slot(np, &(dai)->tx_slot_mask, \ snd_soc_of_parse_tdm_slot(np, &(dai)->tx_slot_mask, \
&(dai)->rx_slot_mask, \ &(dai)->rx_slot_mask, \
&(dai)->slots, \ &(dai)->slots, \
&(dai)->slot_width); &(dai)->slot_width);
void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link); void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link);
void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link, void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
int is_single_links); int is_single_links);
int asoc_simple_card_clean_reference(struct snd_soc_card *card); int asoc_simple_clean_reference(struct snd_soc_card *card);
void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data, void asoc_simple_convert_fixup(struct asoc_simple_data *data,
struct snd_pcm_hw_params *params); struct snd_pcm_hw_params *params);
void asoc_simple_card_parse_convert(struct device *dev, void asoc_simple_parse_convert(struct device *dev,
struct device_node *np, char *prefix, struct device_node *np, char *prefix,
struct asoc_simple_card_data *data); struct asoc_simple_data *data);
int asoc_simple_card_of_parse_routing(struct snd_soc_card *card, int asoc_simple_parse_routing(struct snd_soc_card *card,
char *prefix); char *prefix);
int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card, int asoc_simple_parse_widgets(struct snd_soc_card *card,
char *prefix); char *prefix);
int asoc_simple_card_init_jack(struct snd_soc_card *card, int asoc_simple_init_jack(struct snd_soc_card *card,
struct asoc_simple_jack *sjack, struct asoc_simple_jack *sjack,
int is_hp, char *prefix); int is_hp, char *prefix);
int asoc_simple_card_init_priv(struct asoc_simple_priv *priv, int asoc_simple_init_priv(struct asoc_simple_priv *priv,
struct link_info *li); struct link_info *li);
#ifdef DEBUG #ifdef DEBUG
......
sound/soc/generic/audio-graph-card.c
View file @ ad11e59f
...@@ -107,11 +107,11 @@ static int graph_get_dai_id(struct device_node *ep) ...@@ -107,11 +107,11 @@ static int graph_get_dai_id(struct device_node *ep)
return id; return id;
} }
static int asoc_simple_card_parse_dai(struct device_node *ep, static int asoc_simple_parse_dai(struct device_node *ep,
struct snd_soc_dai_link_component *dlc, struct snd_soc_dai_link_component *dlc,
struct device_node **dai_of_node, struct device_node **dai_of_node,
const char **dai_name, const char **dai_name,
int *is_single_link) int *is_single_link)
{ {
struct device_node *node; struct device_node *node;
struct of_phandle_args args; struct of_phandle_args args;
...@@ -154,18 +154,18 @@ static int asoc_simple_card_parse_dai(struct device_node *ep, ...@@ -154,18 +154,18 @@ static int asoc_simple_card_parse_dai(struct device_node *ep,
static void graph_parse_convert(struct device *dev, static void graph_parse_convert(struct device *dev,
struct device_node *ep, struct device_node *ep,
struct asoc_simple_card_data *adata) struct asoc_simple_data *adata)
{ {
struct device_node *top = dev->of_node; struct device_node *top = dev->of_node;
struct device_node *port = of_get_parent(ep); struct device_node *port = of_get_parent(ep);
struct device_node *ports = of_get_parent(port); struct device_node *ports = of_get_parent(port);
struct device_node *node = of_graph_get_port_parent(ep); struct device_node *node = of_graph_get_port_parent(ep);
asoc_simple_card_parse_convert(dev, top, NULL, adata); asoc_simple_parse_convert(dev, top, NULL, adata);
asoc_simple_card_parse_convert(dev, node, PREFIX, adata); asoc_simple_parse_convert(dev, node, PREFIX, adata);
asoc_simple_card_parse_convert(dev, ports, NULL, adata); asoc_simple_parse_convert(dev, ports, NULL, adata);
asoc_simple_card_parse_convert(dev, port, NULL, adata); asoc_simple_parse_convert(dev, port, NULL, adata);
asoc_simple_card_parse_convert(dev, ep, NULL, adata); asoc_simple_parse_convert(dev, ep, NULL, adata);
of_node_put(port); of_node_put(port);
of_node_put(ports); of_node_put(ports);
...@@ -239,22 +239,22 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -239,22 +239,22 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
dai = dai =
dai_props->cpu_dai = &priv->dais[li->dais++]; dai_props->cpu_dai = &priv->dais[li->dais++];
ret = asoc_simple_card_parse_cpu(ep, dai_link, &is_single_links); ret = asoc_simple_parse_cpu(ep, dai_link, &is_single_links);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_card_parse_clk_cpu(dev, ep, dai_link, dai); ret = asoc_simple_parse_clk_cpu(dev, ep, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"fe.%s", "fe.%s",
dai_link->cpu_dai_name); dai_link->cpu_dai_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* card->num_links includes Codec */ /* card->num_links includes Codec */
asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); asoc_simple_canonicalize_cpu(dai_link, is_single_links);
} else { } else {
struct snd_soc_codec_conf *cconf; struct snd_soc_codec_conf *cconf;
...@@ -273,17 +273,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -273,17 +273,17 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
cconf = cconf =
dai_props->codec_conf = &priv->codec_conf[li->conf++]; dai_props->codec_conf = &priv->codec_conf[li->conf++];
ret = asoc_simple_card_parse_codec(ep, dai_link); ret = asoc_simple_parse_codec(ep, dai_link);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_clk_codec(dev, ep, dai_link, dai); ret = asoc_simple_parse_clk_codec(dev, ep, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"be.%s", "be.%s",
codecs->dai_name); codecs->dai_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -301,14 +301,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -301,14 +301,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
graph_parse_convert(dev, ep, &dai_props->adata); graph_parse_convert(dev, ep, &dai_props->adata);
graph_parse_mclk_fs(top, ep, dai_props); graph_parse_mclk_fs(top, ep, dai_props);
asoc_simple_card_canonicalize_platform(dai_link); asoc_simple_canonicalize_platform(dai_link);
ret = asoc_simple_card_of_parse_tdm(ep, dai); ret = asoc_simple_parse_tdm(ep, dai);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,
NULL, &dai_link->dai_fmt); NULL, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -350,47 +350,47 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, ...@@ -350,47 +350,47 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
graph_parse_mclk_fs(top, cpu_ep, dai_props); graph_parse_mclk_fs(top, cpu_ep, dai_props);
graph_parse_mclk_fs(top, codec_ep, dai_props); graph_parse_mclk_fs(top, codec_ep, dai_props);
ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep,
NULL, &dai_link->dai_fmt); NULL, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_cpu(cpu_ep, dai_link, &single_cpu); ret = asoc_simple_parse_cpu(cpu_ep, dai_link, &single_cpu);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_codec(codec_ep, dai_link); ret = asoc_simple_parse_codec(codec_ep, dai_link);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_of_parse_tdm(cpu_ep, cpu_dai); ret = asoc_simple_parse_tdm(cpu_ep, cpu_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_of_parse_tdm(codec_ep, codec_dai); ret = asoc_simple_parse_tdm(codec_ep, codec_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_clk_cpu(dev, cpu_ep, dai_link, cpu_dai); ret = asoc_simple_parse_clk_cpu(dev, cpu_ep, dai_link, cpu_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_clk_codec(dev, codec_ep, dai_link, codec_dai); ret = asoc_simple_parse_clk_codec(dev, codec_ep, dai_link, codec_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"%s-%s", "%s-%s",
dai_link->cpu_dai_name, dai_link->cpu_dai_name,
dai_link->codecs->dai_name); dai_link->codecs->dai_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
dai_link->ops = &graph_ops; dai_link->ops = &graph_ops;
dai_link->init = asoc_simple_dai_init; dai_link->init = asoc_simple_dai_init;
asoc_simple_card_canonicalize_platform(dai_link); asoc_simple_canonicalize_cpu(dai_link, single_cpu);
asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); asoc_simple_canonicalize_platform(dai_link);
return 0; return 0;
} }
...@@ -414,7 +414,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, ...@@ -414,7 +414,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
struct device_node *codec_ep; struct device_node *codec_ep;
struct device_node *codec_port; struct device_node *codec_port;
struct device_node *codec_port_old = NULL; struct device_node *codec_port_old = NULL;
struct asoc_simple_card_data adata; struct asoc_simple_data adata;
int rc, ret; int rc, ret;
/* loop for all listed CPU port */ /* loop for all listed CPU port */
...@@ -469,11 +469,11 @@ static int graph_parse_of(struct asoc_simple_priv *priv) ...@@ -469,11 +469,11 @@ static int graph_parse_of(struct asoc_simple_priv *priv)
struct link_info li; struct link_info li;
int ret; int ret;
ret = asoc_simple_card_of_parse_widgets(card, NULL); ret = asoc_simple_parse_widgets(card, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_of_parse_routing(card, NULL); ret = asoc_simple_parse_routing(card, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -498,7 +498,7 @@ static int graph_parse_of(struct asoc_simple_priv *priv) ...@@ -498,7 +498,7 @@ static int graph_parse_of(struct asoc_simple_priv *priv)
return ret; return ret;
} }
return asoc_simple_card_parse_card_name(card, NULL); return asoc_simple_parse_card_name(card, NULL);
} }
static int graph_count_noml(struct asoc_simple_priv *priv, static int graph_count_noml(struct asoc_simple_priv *priv,
...@@ -601,11 +601,11 @@ static int graph_card_probe(struct snd_soc_card *card) ...@@ -601,11 +601,11 @@ static int graph_card_probe(struct snd_soc_card *card)
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
int ret; int ret;
ret = asoc_simple_card_init_hp(card, &priv->hp_jack, NULL); ret = asoc_simple_init_hp(card, &priv->hp_jack, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_init_mic(card, &priv->mic_jack, NULL); ret = asoc_simple_init_mic(card, &priv->mic_jack, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -637,7 +637,7 @@ static int graph_probe(struct platform_device *pdev) ...@@ -637,7 +637,7 @@ static int graph_probe(struct platform_device *pdev)
if (!li.link || !li.dais) if (!li.link || !li.dais)
return -EINVAL; return -EINVAL;
ret = asoc_simple_card_init_priv(priv, &li); ret = asoc_simple_init_priv(priv, &li);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -665,7 +665,7 @@ static int graph_probe(struct platform_device *pdev) ...@@ -665,7 +665,7 @@ static int graph_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
asoc_simple_card_clean_reference(card); asoc_simple_clean_reference(card);
return ret; return ret;
} }
...@@ -674,7 +674,7 @@ static int graph_remove(struct platform_device *pdev) ...@@ -674,7 +674,7 @@ static int graph_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
return asoc_simple_card_clean_reference(card); return asoc_simple_clean_reference(card);
} }
static const struct of_device_id graph_of_match[] = { static const struct of_device_id graph_of_match[] = {
......
sound/soc/generic/simple-card-utils.c
View file @ ad11e59f
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/simple_card_utils.h> #include <sound/simple_card_utils.h>
void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data, void asoc_simple_convert_fixup(struct asoc_simple_data *data,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_interval *rate = hw_param_interval(params, struct snd_interval *rate = hw_param_interval(params,
SNDRV_PCM_HW_PARAM_RATE); SNDRV_PCM_HW_PARAM_RATE);
...@@ -30,12 +30,12 @@ void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data, ...@@ -30,12 +30,12 @@ void asoc_simple_card_convert_fixup(struct asoc_simple_card_data *data,
channels->min = channels->min =
channels->max = data->convert_channels; channels->max = data->convert_channels;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_convert_fixup); EXPORT_SYMBOL_GPL(asoc_simple_convert_fixup);
void asoc_simple_card_parse_convert(struct device *dev, void asoc_simple_parse_convert(struct device *dev,
struct device_node *np, struct device_node *np,
char *prefix, char *prefix,
struct asoc_simple_card_data *data) struct asoc_simple_data *data)
{ {
char prop[128]; char prop[128];
...@@ -50,13 +50,13 @@ void asoc_simple_card_parse_convert(struct device *dev, ...@@ -50,13 +50,13 @@ void asoc_simple_card_parse_convert(struct device *dev,
snprintf(prop, sizeof(prop), "%s%s", prefix, "convert-channels"); snprintf(prop, sizeof(prop), "%s%s", prefix, "convert-channels");
of_property_read_u32(np, prop, &data->convert_channels); of_property_read_u32(np, prop, &data->convert_channels);
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_parse_convert); EXPORT_SYMBOL_GPL(asoc_simple_parse_convert);
int asoc_simple_card_parse_daifmt(struct device *dev, int asoc_simple_parse_daifmt(struct device *dev,
struct device_node *node, struct device_node *node,
struct device_node *codec, struct device_node *codec,
char *prefix, char *prefix,
unsigned int *retfmt) unsigned int *retfmt)
{ {
struct device_node *bitclkmaster = NULL; struct device_node *bitclkmaster = NULL;
struct device_node *framemaster = NULL; struct device_node *framemaster = NULL;
...@@ -92,11 +92,11 @@ int asoc_simple_card_parse_daifmt(struct device *dev, ...@@ -92,11 +92,11 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_parse_daifmt); EXPORT_SYMBOL_GPL(asoc_simple_parse_daifmt);
int asoc_simple_card_set_dailink_name(struct device *dev, int asoc_simple_set_dailink_name(struct device *dev,
struct snd_soc_dai_link *dai_link, struct snd_soc_dai_link *dai_link,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list ap; va_list ap;
char *name = NULL; char *name = NULL;
...@@ -115,10 +115,10 @@ int asoc_simple_card_set_dailink_name(struct device *dev, ...@@ -115,10 +115,10 @@ int asoc_simple_card_set_dailink_name(struct device *dev,
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name); EXPORT_SYMBOL_GPL(asoc_simple_set_dailink_name);
int asoc_simple_card_parse_card_name(struct snd_soc_card *card, int asoc_simple_parse_card_name(struct snd_soc_card *card,
char *prefix) char *prefix)
{ {
int ret; int ret;
...@@ -141,9 +141,9 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, ...@@ -141,9 +141,9 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); EXPORT_SYMBOL_GPL(asoc_simple_parse_card_name);
static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai) static int asoc_simple_clk_enable(struct asoc_simple_dai *dai)
{ {
if (dai) if (dai)
return clk_prepare_enable(dai->clk); return clk_prepare_enable(dai->clk);
...@@ -151,18 +151,18 @@ static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai) ...@@ -151,18 +151,18 @@ static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai)
return 0; return 0;
} }
static void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai) static void asoc_simple_clk_disable(struct asoc_simple_dai *dai)
{ {
if (dai) if (dai)
clk_disable_unprepare(dai->clk); clk_disable_unprepare(dai->clk);
} }
int asoc_simple_card_parse_clk(struct device *dev, int asoc_simple_parse_clk(struct device *dev,
struct device_node *node, struct device_node *node,
struct device_node *dai_of_node, struct device_node *dai_of_node,
struct asoc_simple_dai *simple_dai, struct asoc_simple_dai *simple_dai,
const char *dai_name, const char *dai_name,
struct snd_soc_dai_link_component *dlc) struct snd_soc_dai_link_component *dlc)
{ {
struct clk *clk; struct clk *clk;
u32 val; u32 val;
...@@ -202,7 +202,7 @@ int asoc_simple_card_parse_clk(struct device *dev, ...@@ -202,7 +202,7 @@ int asoc_simple_card_parse_clk(struct device *dev,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk); EXPORT_SYMBOL_GPL(asoc_simple_parse_clk);
int asoc_simple_startup(struct snd_pcm_substream *substream) int asoc_simple_startup(struct snd_pcm_substream *substream)
{ {
...@@ -211,13 +211,13 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) ...@@ -211,13 +211,13 @@ int asoc_simple_startup(struct snd_pcm_substream *substream)
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
int ret; int ret;
ret = asoc_simple_card_clk_enable(dai_props->cpu_dai); ret = asoc_simple_clk_enable(dai_props->cpu_dai);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_card_clk_enable(dai_props->codec_dai); ret = asoc_simple_clk_enable(dai_props->codec_dai);
if (ret) if (ret)
asoc_simple_card_clk_disable(dai_props->cpu_dai); asoc_simple_clk_disable(dai_props->cpu_dai);
return ret; return ret;
} }
...@@ -230,9 +230,9 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream) ...@@ -230,9 +230,9 @@ void asoc_simple_shutdown(struct snd_pcm_substream *substream)
struct simple_dai_props *dai_props = struct simple_dai_props *dai_props =
simple_priv_to_props(priv, rtd->num); simple_priv_to_props(priv, rtd->num);
asoc_simple_card_clk_disable(dai_props->cpu_dai); asoc_simple_clk_disable(dai_props->cpu_dai);
asoc_simple_card_clk_disable(dai_props->codec_dai); asoc_simple_clk_disable(dai_props->codec_dai);
} }
EXPORT_SYMBOL_GPL(asoc_simple_shutdown); EXPORT_SYMBOL_GPL(asoc_simple_shutdown);
...@@ -299,13 +299,13 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -299,13 +299,13 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
asoc_simple_card_convert_fixup(&dai_props->adata, params); asoc_simple_convert_fixup(&dai_props->adata, params);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup); EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup);
static int asoc_simple_card_init_dai(struct snd_soc_dai *dai, static int asoc_simple_init_dai(struct snd_soc_dai *dai,
struct asoc_simple_dai *simple_dai) struct asoc_simple_dai *simple_dai)
{ {
int ret; int ret;
...@@ -343,13 +343,13 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd) ...@@ -343,13 +343,13 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
int ret; int ret;
ret = asoc_simple_card_init_dai(rtd->codec_dai, ret = asoc_simple_init_dai(rtd->codec_dai,
dai_props->codec_dai); dai_props->codec_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_init_dai(rtd->cpu_dai, ret = asoc_simple_init_dai(rtd->cpu_dai,
dai_props->cpu_dai); dai_props->cpu_dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -357,16 +357,16 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd) ...@@ -357,16 +357,16 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
} }
EXPORT_SYMBOL_GPL(asoc_simple_dai_init); EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link) void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
{ {
/* Assumes platform == cpu */ /* Assumes platform == cpu */
if (!dai_link->platforms->of_node) if (!dai_link->platforms->of_node)
dai_link->platforms->of_node = dai_link->cpu_of_node; dai_link->platforms->of_node = dai_link->cpu_of_node;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_platform); EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);
void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link, void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
int is_single_links) int is_single_links)
{ {
/* /*
* In soc_bind_dai_link() will check cpu name after * In soc_bind_dai_link() will check cpu name after
...@@ -380,9 +380,9 @@ void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link, ...@@ -380,9 +380,9 @@ void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
if (is_single_links) if (is_single_links)
dai_link->cpu_dai_name = NULL; dai_link->cpu_dai_name = NULL;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu); EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_cpu);
int asoc_simple_card_clean_reference(struct snd_soc_card *card) int asoc_simple_clean_reference(struct snd_soc_card *card)
{ {
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
int i; int i;
...@@ -393,10 +393,10 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card) ...@@ -393,10 +393,10 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card)
} }
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_clean_reference); EXPORT_SYMBOL_GPL(asoc_simple_clean_reference);
int asoc_simple_card_of_parse_routing(struct snd_soc_card *card, int asoc_simple_parse_routing(struct snd_soc_card *card,
char *prefix) char *prefix)
{ {
struct device_node *node = card->dev->of_node; struct device_node *node = card->dev->of_node;
char prop[128]; char prop[128];
...@@ -411,10 +411,10 @@ int asoc_simple_card_of_parse_routing(struct snd_soc_card *card, ...@@ -411,10 +411,10 @@ int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,
return snd_soc_of_parse_audio_routing(card, prop); return snd_soc_of_parse_audio_routing(card, prop);
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_of_parse_routing); EXPORT_SYMBOL_GPL(asoc_simple_parse_routing);
int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card, int asoc_simple_parse_widgets(struct snd_soc_card *card,
char *prefix) char *prefix)
{ {
struct device_node *node = card->dev->of_node; struct device_node *node = card->dev->of_node;
char prop[128]; char prop[128];
...@@ -430,11 +430,11 @@ int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card, ...@@ -430,11 +430,11 @@ int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,
/* no widgets is not error */ /* no widgets is not error */
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_of_parse_widgets); EXPORT_SYMBOL_GPL(asoc_simple_parse_widgets);
int asoc_simple_card_init_jack(struct snd_soc_card *card, int asoc_simple_init_jack(struct snd_soc_card *card,
struct asoc_simple_jack *sjack, struct asoc_simple_jack *sjack,
int is_hp, char *prefix) int is_hp, char *prefix)
{ {
struct device *dev = card->dev; struct device *dev = card->dev;
enum of_gpio_flags flags; enum of_gpio_flags flags;
...@@ -485,10 +485,10 @@ int asoc_simple_card_init_jack(struct snd_soc_card *card, ...@@ -485,10 +485,10 @@ int asoc_simple_card_init_jack(struct snd_soc_card *card,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(asoc_simple_card_init_jack); EXPORT_SYMBOL_GPL(asoc_simple_init_jack);
int asoc_simple_card_init_priv(struct asoc_simple_priv *priv, int asoc_simple_init_priv(struct asoc_simple_priv *priv,
struct link_info *li) struct link_info *li)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
...@@ -513,7 +513,7 @@ int asoc_simple_card_init_priv(struct asoc_simple_priv *priv, ...@@ -513,7 +513,7 @@ int asoc_simple_card_init_priv(struct asoc_simple_priv *priv,
* *
* "platform" might be removed * "platform" might be removed
* see * see
* simple-card-utils.c :: asoc_simple_card_canonicalize_platform() * simple-card-utils.c :: asoc_simple_canonicalize_platform()
*/ */
for (i = 0; i < li->link; i++) { for (i = 0; i < li->link; i++) {
dai_link[i].codecs = &dai_props[i].codecs; dai_link[i].codecs = &dai_props[i].codecs;
......
sound/soc/generic/simple-card.c
View file @ ad11e59f
...@@ -25,11 +25,11 @@ static const struct snd_soc_ops simple_ops = { ...@@ -25,11 +25,11 @@ static const struct snd_soc_ops simple_ops = {
.hw_params = asoc_simple_hw_params, .hw_params = asoc_simple_hw_params,
}; };
static int asoc_simple_card_parse_dai(struct device_node *node, static int asoc_simple_parse_dai(struct device_node *node,
struct snd_soc_dai_link_component *dlc, struct snd_soc_dai_link_component *dlc,
struct device_node **dai_of_node, struct device_node **dai_of_node,
const char **dai_name, const char **dai_name,
int *is_single_link) int *is_single_link)
{ {
struct of_phandle_args args; struct of_phandle_args args;
int ret; int ret;
...@@ -73,15 +73,15 @@ static int asoc_simple_card_parse_dai(struct device_node *node, ...@@ -73,15 +73,15 @@ static int asoc_simple_card_parse_dai(struct device_node *node,
static void simple_parse_convert(struct device *dev, static void simple_parse_convert(struct device *dev,
struct device_node *np, struct device_node *np,
struct asoc_simple_card_data *adata) struct asoc_simple_data *adata)
{ {
struct device_node *top = dev->of_node; struct device_node *top = dev->of_node;
struct device_node *node = of_get_parent(np); struct device_node *node = of_get_parent(np);
asoc_simple_card_parse_convert(dev, top, PREFIX, adata); asoc_simple_parse_convert(dev, top, PREFIX, adata);
asoc_simple_card_parse_convert(dev, node, PREFIX, adata); asoc_simple_parse_convert(dev, node, PREFIX, adata);
asoc_simple_card_parse_convert(dev, node, NULL, adata); asoc_simple_parse_convert(dev, node, NULL, adata);
asoc_simple_card_parse_convert(dev, np, NULL, adata); asoc_simple_parse_convert(dev, np, NULL, adata);
of_node_put(node); of_node_put(node);
} }
...@@ -156,21 +156,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -156,21 +156,21 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
dai = dai =
dai_props->cpu_dai = &priv->dais[li->dais++]; dai_props->cpu_dai = &priv->dais[li->dais++];
ret = asoc_simple_card_parse_cpu(np, dai_link, &is_single_links); ret = asoc_simple_parse_cpu(np, dai_link, &is_single_links);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai); ret = asoc_simple_parse_clk_cpu(dev, np, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"fe.%s", "fe.%s",
dai_link->cpu_dai_name); dai_link->cpu_dai_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
asoc_simple_card_canonicalize_cpu(dai_link, is_single_links); asoc_simple_canonicalize_cpu(dai_link, is_single_links);
} else { } else {
struct snd_soc_codec_conf *cconf; struct snd_soc_codec_conf *cconf;
...@@ -189,17 +189,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -189,17 +189,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
cconf = cconf =
dai_props->codec_conf = &priv->codec_conf[li->conf++]; dai_props->codec_conf = &priv->codec_conf[li->conf++];
ret = asoc_simple_card_parse_codec(np, dai_link); ret = asoc_simple_parse_codec(np, dai_link);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai); ret = asoc_simple_parse_clk_codec(dev, np, dai_link, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"be.%s", "be.%s",
codecs->dai_name); codecs->dai_name);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -215,14 +215,14 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -215,14 +215,14 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
simple_parse_convert(dev, np, &dai_props->adata); simple_parse_convert(dev, np, &dai_props->adata);
simple_parse_mclk_fs(top, np, codec, dai_props, prefix); simple_parse_mclk_fs(top, np, codec, dai_props, prefix);
asoc_simple_card_canonicalize_platform(dai_link); asoc_simple_canonicalize_platform(dai_link);
ret = asoc_simple_card_of_parse_tdm(np, dai); ret = asoc_simple_parse_tdm(np, dai);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_card_parse_daifmt(dev, node, codec, ret = asoc_simple_parse_daifmt(dev, node, codec,
prefix, &dai_link->dai_fmt); prefix, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -280,53 +280,53 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, ...@@ -280,53 +280,53 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
codec_dai = codec_dai =
dai_props->codec_dai = &priv->dais[li->dais++]; dai_props->codec_dai = &priv->dais[li->dais++];
ret = asoc_simple_card_parse_daifmt(dev, node, codec, ret = asoc_simple_parse_daifmt(dev, node, codec,
prefix, &dai_link->dai_fmt); prefix, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix); simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix);
ret = asoc_simple_card_parse_cpu(cpu, dai_link, &single_cpu); ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_parse_codec(codec, dai_link); ret = asoc_simple_parse_codec(codec, dai_link);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_parse_platform(plat, dai_link); ret = asoc_simple_parse_platform(plat, dai_link);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_of_parse_tdm(cpu, cpu_dai); ret = asoc_simple_parse_tdm(cpu, cpu_dai);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_of_parse_tdm(codec, codec_dai); ret = asoc_simple_parse_tdm(codec, codec_dai);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_parse_clk_cpu(dev, cpu, dai_link, cpu_dai); ret = asoc_simple_parse_clk_cpu(dev, cpu, dai_link, cpu_dai);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_parse_clk_codec(dev, codec, dai_link, codec_dai); ret = asoc_simple_parse_clk_codec(dev, codec, dai_link, codec_dai);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_card_set_dailink_name(dev, dai_link, ret = asoc_simple_set_dailink_name(dev, dai_link,
"%s-%s", "%s-%s",
dai_link->cpu_dai_name, dai_link->cpu_dai_name,
dai_link->codecs->dai_name); dai_link->codecs->dai_name);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
dai_link->ops = &simple_ops; dai_link->ops = &simple_ops;
dai_link->init = asoc_simple_dai_init; dai_link->init = asoc_simple_dai_init;
asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); asoc_simple_canonicalize_cpu(dai_link, single_cpu);
asoc_simple_card_canonicalize_platform(dai_link); asoc_simple_canonicalize_platform(dai_link);
dai_link_of_err: dai_link_of_err:
of_node_put(plat); of_node_put(plat);
...@@ -361,7 +361,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, ...@@ -361,7 +361,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
/* loop for all dai-link */ /* loop for all dai-link */
do { do {
struct asoc_simple_card_data adata; struct asoc_simple_data adata;
struct device_node *codec; struct device_node *codec;
struct device_node *np; struct device_node *np;
int num = of_get_child_count(node); int num = of_get_child_count(node);
...@@ -451,11 +451,11 @@ static int simple_parse_of(struct asoc_simple_priv *priv) ...@@ -451,11 +451,11 @@ static int simple_parse_of(struct asoc_simple_priv *priv)
if (!top) if (!top)
return -EINVAL; return -EINVAL;
ret = asoc_simple_card_of_parse_widgets(card, PREFIX); ret = asoc_simple_parse_widgets(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_of_parse_routing(card, PREFIX); ret = asoc_simple_parse_routing(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -481,7 +481,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv) ...@@ -481,7 +481,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv)
return ret; return ret;
} }
ret = asoc_simple_card_parse_card_name(card, PREFIX); ret = asoc_simple_parse_card_name(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -587,11 +587,11 @@ static int simple_soc_probe(struct snd_soc_card *card) ...@@ -587,11 +587,11 @@ static int simple_soc_probe(struct snd_soc_card *card)
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
int ret; int ret;
ret = asoc_simple_card_init_hp(card, &priv->hp_jack, PREFIX); ret = asoc_simple_init_hp(card, &priv->hp_jack, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_card_init_mic(card, &priv->mic_jack, PREFIX); ret = asoc_simple_init_mic(card, &priv->mic_jack, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -622,7 +622,7 @@ static int simple_probe(struct platform_device *pdev) ...@@ -622,7 +622,7 @@ static int simple_probe(struct platform_device *pdev)
if (!li.link || !li.dais) if (!li.link || !li.dais)
return -EINVAL; return -EINVAL;
ret = asoc_simple_card_init_priv(priv, &li); ret = asoc_simple_init_priv(priv, &li);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -691,7 +691,7 @@ static int simple_probe(struct platform_device *pdev) ...@@ -691,7 +691,7 @@ static int simple_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
asoc_simple_card_clean_reference(card); asoc_simple_clean_reference(card);
return ret; return ret;
} }
...@@ -700,7 +700,7 @@ static int simple_remove(struct platform_device *pdev) ...@@ -700,7 +700,7 @@ static int simple_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
return asoc_simple_card_clean_reference(card); return asoc_simple_clean_reference(card);
} }
static const struct of_device_id simple_of_match[] = { static const struct of_device_id simple_of_match[] = {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7