From 102b5a8d4ac62d8ff4920b64da8b4b488ce67261 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 29 Jan 2014 14:42:55 +0100 Subject: [PATCH] ASoC: core: Convert to snd_card_new() with a device pointer Also remove superfluous card->dev assignment. Reviewed-by: Mark Brown Signed-off-by: Takashi Iwai --- sound/soc/soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index fe1df50805a3..135ddb01aadb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1654,7 +1654,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *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); if (ret < 0) { dev_err(card->dev, @@ -1662,7 +1662,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) card->name, ret); goto base_error; } - card->snd_card->dev = card->dev; card->dapm.bias_level = SND_SOC_BIAS_OFF; card->dapm.dev = card->dev; -- 2.11.0