From: Lars-Peter Clausen Date: Mon, 19 May 2014 09:41:48 +0000 (+0200) Subject: ASoC: mop500_ab8500: Replace instances of rtd->codec->card with rtd->card X-Git-Tag: firefly_0821_release~176^2~3750^2~24^2~15^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55bc82536960e4749df7ae5666a93702190c53d4;p=firefly-linux-kernel-4.4.55.git ASoC: mop500_ab8500: Replace instances of rtd->codec->card with rtd->card No need to go via the CODEC to get a pointer to the card. This will help to eventually remove the card field from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown --- diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 7e923ecf8901..be4f1ac7cd5e 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -411,7 +411,7 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd) drvdata->mclk_sel = MCLK_ULPCLK; /* Add controls */ - ret = snd_soc_add_card_controls(codec->card, mop500_ab8500_ctrls, + ret = snd_soc_add_card_controls(rtd->card, mop500_ab8500_ctrls, ARRAY_SIZE(mop500_ab8500_ctrls)); if (ret < 0) { pr_err("%s: Failed to add machine-controls (%d)!\n",