diff options
| author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-07 15:07:52 (GMT) |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 07:32:39 (GMT) |
| commit | e550e17ffeb8cf8db27724eaf2ad05f77388afb9 (patch) | |
| tree | 0c73c0d1e42ce77b049f8d4c39ce1937f5256eca /sound/soc/codecs/wm8510.c | |
| parent | 9cb132d743cf39b3bbe4288e9035217e7237a0bb (diff) | |
| download | linux-fsl-qoriq-e550e17ffeb8cf8db27724eaf2ad05f77388afb9.tar.xz | |
ALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the codec drivers.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/codecs/wm8510.c')
| -rw-r--r-- | sound/soc/codecs/wm8510.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index b549f67..67325fd 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -332,7 +332,7 @@ static void pll_factors(unsigned int target, unsigned int source) pll_div.k = K; } -static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai, +static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, unsigned int freq_in, unsigned int freq_out) { struct snd_soc_codec *codec = codec_dai->codec; @@ -368,7 +368,7 @@ static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai, /* * Configure WM8510 clock dividers. */ -static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, +static int wm8510_set_dai_clkdiv(struct snd_soc_dai *codec_dai, int div_id, int div) { struct snd_soc_codec *codec = codec_dai->codec; @@ -402,7 +402,7 @@ static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, return 0; } -static int wm8510_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, +static int wm8510_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { struct snd_soc_codec *codec = codec_dai->codec; @@ -510,7 +510,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } -static int wm8510_mute(struct snd_soc_codec_dai *dai, int mute) +static int wm8510_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; u16 mute_reg = wm8510_read_reg_cache(codec, WM8510_DAC) & 0xffbf; @@ -554,7 +554,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec, #define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) -struct snd_soc_codec_dai wm8510_dai = { +struct snd_soc_dai wm8510_dai = { .name = "WM8510 HiFi", .playback = { .stream_name = "Playback", |