diff options
| author | Ola Lilja <elilola@steludxu2785.(none)> | 2011-04-08 13:23:07 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 11:19:57 +0200 |
| commit | 226aff3133d6d1ba6c8e809e31dfc89f0ae7f8f5 (patch) | |
| tree | ccac5df94b0a3ffbe1e62189d26336ed20f5c3a9 /sound | |
| parent | 2d06f5ac948b8c79894d759ff57a6d7624b3d672 (diff) | |
Ux500 ASoC: Fix build-error for AV8100 codec-driver
Change-Id: I4e4d016854b875580a8a7ec4f5243dc8f11cfbe3
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21096
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/av8100_audio.c | 24 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_av8100.c | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sound/soc/codecs/av8100_audio.c b/sound/soc/codecs/av8100_audio.c index 4d34adae476..a9b9e7586b6 100644 --- a/sound/soc/codecs/av8100_audio.c +++ b/sound/soc/codecs/av8100_audio.c @@ -33,6 +33,18 @@ struct av8100_codec_dai_data { struct hdmi_audio_settings as; }; +static struct av8100_codec_dai_data *get_dai_data_codec(struct snd_soc_codec *codec, + int dai_id) +{ + struct av8100_codec_dai_data *dai_data = snd_soc_codec_get_drvdata(codec); + return &dai_data[dai_id]; +} + +static struct av8100_codec_dai_data *get_dai_data(struct snd_soc_dai *codec_dai) +{ + return get_dai_data_codec(codec_dai->codec, codec_dai->id); +} + /* Extended interface for codec-driver */ int av8100_audio_change_hdmi_audio_settings(struct snd_soc_dai *codec_dai, @@ -198,18 +210,6 @@ static int av8100_codec_send_audio_infoframe(struct hdmi_audio_settings *as) return 0; } -static struct av8100_codec_dai_data *get_dai_data_codec(struct snd_soc_codec *codec, - int dai_id) -{ - struct av8100_codec_dai_data *dai_data = snd_soc_codec_get_drvdata(codec); - return &dai_data[dai_id]; -} - -static struct av8100_codec_dai_data *get_dai_data(struct snd_soc_dai *codec_dai) -{ - return get_dai_data_codec(codec_dai->codec, codec_dai->id); -} - static int av8100_codec_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *hw_params, struct snd_soc_dai *codec_dai) diff --git a/sound/soc/ux500/ux500_av8100.c b/sound/soc/ux500/ux500_av8100.c index 5c7213001a0..efb6318e1a7 100644 --- a/sound/soc/ux500/ux500_av8100.c +++ b/sound/soc/ux500/ux500_av8100.c @@ -103,7 +103,7 @@ static int ux500_av8100_hw_params(struct snd_pcm_substream *substream, as.channel_allocation = hdmi_ca; as.level_shift_value = AV8100_CODEC_LSV_0DB; as.downmix_inhibit = false; - ret = av8100_codec_change_hdmi_audio_settings(codec_dai, &as); + ret = av8100_audio_change_hdmi_audio_settings(codec_dai, &as); if (ret < 0) { pr_err("%s: Unable to change HDMI audio-settings for codec-DAI " "(av8100_codec_change_hdmi_audio_settings returned %d)!\n", |