Commit 102b5a8d authored by Takashi Iwai's avatar Takashi Iwai

ASoC: core: Convert to snd_card_new() with a device pointer

Also remove superfluous card->dev assignment.
Reviewed-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6e10af77
...@@ -1654,7 +1654,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1654,7 +1654,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
} }
/* card bind complete so register a sound card */ /* card bind complete so register a sound card */
ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, ret = snd_card_new(card->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
card->owner, 0, &card->snd_card); card->owner, 0, &card->snd_card);
if (ret < 0) { if (ret < 0) {
dev_err(card->dev, dev_err(card->dev,
...@@ -1662,7 +1662,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1662,7 +1662,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
card->name, ret); card->name, ret);
goto base_error; goto base_error;
} }
card->snd_card->dev = card->dev;
card->dapm.bias_level = SND_SOC_BIAS_OFF; card->dapm.bias_level = SND_SOC_BIAS_OFF;
card->dapm.dev = card->dev; card->dapm.dev = card->dev;
......
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