struct snd_soc_dai_link *dai_link;
};
--- --#define simple_priv_to_dev(priv) ((priv)->snd_card.dev)
--- --#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i))
+++ ++#define simple_priv_to_card(priv) (&(priv)->snd_card)
#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))
+++ ++#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev)
+++ ++#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i))
#define DAI "sound-dai"
#define CELL "#sound-dai-cells"
if (ret < 0)
goto dai_link_of_err;
-- - ret = asoc_simple_card_parse_clk_cpu(cpu, dai_link, cpu_dai);
++ + ret = asoc_simple_card_parse_clk_cpu(dev, cpu, dai_link, cpu_dai);
if (ret < 0)
goto dai_link_of_err;
-- - ret = asoc_simple_card_parse_clk_codec(codec, dai_link, codec_dai);
++ + ret = asoc_simple_card_parse_clk_codec(dev, codec, dai_link, codec_dai);
if (ret < 0)
goto dai_link_of_err;
{
struct device *dev = simple_priv_to_dev(priv);
struct device_node *aux_node;
+++ ++ struct snd_soc_card *card = simple_priv_to_card(priv);
int i, n, len;
if (!of_find_property(node, PREFIX "aux-devs", &len))
if (n <= 0)
return -EINVAL;
--- -- priv->snd_card.aux_dev = devm_kzalloc(dev,
--- -- n * sizeof(*priv->snd_card.aux_dev), GFP_KERNEL);
--- -- if (!priv->snd_card.aux_dev)
+++ ++ card->aux_dev = devm_kzalloc(dev,
+++ ++ n * sizeof(*card->aux_dev), GFP_KERNEL);
+++ ++ if (!card->aux_dev)
return -ENOMEM;
for (i = 0; i < n; i++) {
aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);
if (!aux_node)
return -EINVAL;
--- -- priv->snd_card.aux_dev[i].codec_of_node = aux_node;
+++ ++ card->aux_dev[i].codec_of_node = aux_node;
}
--- -- priv->snd_card.num_aux_devs = n;
+++ ++ card->num_aux_devs = n;
return 0;
}
struct simple_card_data *priv)
{
struct device *dev = simple_priv_to_dev(priv);
+++ ++ struct snd_soc_card *card = simple_priv_to_card(priv);
struct device_node *dai_link;
int ret;
/* The off-codec widgets */
if (of_property_read_bool(node, PREFIX "widgets")) {
--- -- ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
+++ ++ ret = snd_soc_of_parse_audio_simple_widgets(card,
PREFIX "widgets");
if (ret)
goto card_parse_end;
/* DAPM routes */
if (of_property_read_bool(node, PREFIX "routing")) {
--- -- ret = snd_soc_of_parse_audio_routing(&priv->snd_card,
+++ ++ ret = snd_soc_of_parse_audio_routing(card,
PREFIX "routing");
if (ret)
goto card_parse_end;
goto card_parse_end;
}
--- -- ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
+++ ++ ret = asoc_simple_card_parse_card_name(card, PREFIX);
if (ret < 0)
goto card_parse_end;
struct simple_card_data *priv;
struct snd_soc_dai_link *dai_link;
struct simple_dai_props *dai_props;
--- -- struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev;
+++ ++ struct device_node *np = dev->of_node;
+++ ++ struct snd_soc_card *card;
int num, ret;
/* Get the number of DAI links */
priv->dai_link = dai_link;
/* Init snd_soc_card */
--- -- priv->snd_card.owner = THIS_MODULE;
--- -- priv->snd_card.dev = dev;
--- -- priv->snd_card.dai_link = priv->dai_link;
--- -- priv->snd_card.num_links = num;
+++ ++ card = simple_priv_to_card(priv);
+++ ++ card->owner = THIS_MODULE;
+++ ++ card->dev = dev;
+++ ++ card->dai_link = priv->dai_link;
+++ ++ card->num_links = num;
if (np && of_device_is_available(np)) {
return -EINVAL;
}
--- -- priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name;
+++ ++ card->name = (cinfo->card) ? cinfo->card : cinfo->name;
dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name;
dai_link->platform_name = cinfo->platform;
sizeof(priv->dai_props->codec_dai));
}
--- -- snd_soc_card_set_drvdata(&priv->snd_card, priv);
+++ ++ snd_soc_card_set_drvdata(card, priv);
--- -- ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+++ ++ ret = devm_snd_soc_register_card(dev, card);
if (ret >= 0)
return ret;
err:
--- -- asoc_simple_card_clean_reference(&priv->snd_card);
+++ ++ asoc_simple_card_clean_reference(card);
return ret;
}
u32 convert_channels;
};
--- --#define simple_priv_to_dev(priv) ((priv)->snd_card.dev)
--- --#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i))
+++ ++#define simple_priv_to_card(priv) (&(priv)->snd_card)
#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))
+++ ++#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev)
+++ ++#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i))
#define DAI "sound-dai"
#define CELL "#sound-dai-cells"
struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx);
struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx);
+++ ++ struct snd_soc_card *card = simple_priv_to_card(priv);
int ret;
if (is_fe) {
if (ret)
return ret;
-- - ret = asoc_simple_card_parse_clk_cpu(np, dai_link, dai_props);
++ + ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai_props);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
-- - ret = asoc_simple_card_parse_clk_codec(np, dai_link, dai_props);
++ + ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai_props);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
--- -- snd_soc_of_parse_audio_prefix(&priv->snd_card,
+++ ++ snd_soc_of_parse_audio_prefix(card,
&priv->codec_conf,
dai_link->codec_of_node,
PREFIX "prefix");
{
struct device *dev = simple_priv_to_dev(priv);
struct device_node *np;
+++ ++ struct snd_soc_card *card = simple_priv_to_card(priv);
unsigned int daifmt = 0;
bool is_fe;
int ret, i;
if (!node)
return -EINVAL;
--- -- ret = snd_soc_of_parse_audio_routing(&priv->snd_card, PREFIX "routing");
+++ ++ ret = snd_soc_of_parse_audio_routing(card, PREFIX "routing");
if (ret < 0)
return ret;
i++;
}
--- -- ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);
+++ ++ ret = asoc_simple_card_parse_card_name(card, PREFIX);
if (ret < 0)
return ret;
dev_dbg(dev, "New card: %s\n",
--- -- priv->snd_card.name ? priv->snd_card.name : "");
+++ ++ card->name ? card->name : "");
dev_dbg(dev, "convert_rate %d\n", priv->convert_rate);
dev_dbg(dev, "convert_channels %d\n", priv->convert_channels);
struct simple_card_data *priv;
struct snd_soc_dai_link *dai_link;
struct asoc_simple_dai *dai_props;
+++ ++ struct snd_soc_card *card;
struct device *dev = &pdev->dev;
--- -- struct device_node *np = pdev->dev.of_node;
+++ ++ struct device_node *np = dev->of_node;
int num, ret;
/* Allocate the private data */
priv->dai_link = dai_link;
/* Init snd_soc_card */
--- -- priv->snd_card.owner = THIS_MODULE;
--- -- priv->snd_card.dev = dev;
--- -- priv->snd_card.dai_link = priv->dai_link;
--- -- priv->snd_card.num_links = num;
--- -- priv->snd_card.codec_conf = &priv->codec_conf;
--- -- priv->snd_card.num_configs = 1;
+++ ++ card = simple_priv_to_card(priv);
+++ ++ card->owner = THIS_MODULE;
+++ ++ card->dev = dev;
+++ ++ card->dai_link = priv->dai_link;
+++ ++ card->num_links = num;
+++ ++ card->codec_conf = &priv->codec_conf;
+++ ++ card->num_configs = 1;
ret = asoc_simple_card_parse_of(np, priv);
if (ret < 0) {
goto err;
}
--- -- snd_soc_card_set_drvdata(&priv->snd_card, priv);
+++ ++ snd_soc_card_set_drvdata(card, priv);
--- -- ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+++ ++ ret = devm_snd_soc_register_card(dev, card);
if (ret >= 0)
return ret;
err:
--- -- asoc_simple_card_clean_reference(&priv->snd_card);
+++ ++ asoc_simple_card_clean_reference(card);
return ret;
}