On Fri, 2010-12-03 at 10:34 +0900, Jassi Brar wrote:
> We want the index of DAI's driver here.
>
It's fine but could you add a little more context here.
> Signed-off-by: Jassi Brar <jassi.brar@xxxxxxxxxxx>
> ---
> sound/soc/codecs/wm8580.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
> index e2a9276..cb7765f 100644
> --- a/sound/soc/codecs/wm8580.c
> +++ b/sound/soc/codecs/wm8580.c
> @@ -507,13 +507,13 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream,
> }
>
> /* Look up the SYSCLK ratio; accept only exact matches */
> - ratio = wm8580->sysclk[dai->id] / params_rate(params);
> + ratio = wm8580->sysclk[dai->driver->id] / params_rate(params);
> for (i = 0; i < ARRAY_SIZE(wm8580_sysclk_ratios); i++)
> if (ratio == wm8580_sysclk_ratios[i])
> break;
> if (i == ARRAY_SIZE(wm8580_sysclk_ratios)) {
> dev_err(codec->dev, "Invalid clock ratio %d/%d\n",
> - wm8580->sysclk[dai->id], params_rate(params));
> + wm8580->sysclk[dai->driver->id], params_rate(params));
> return -EINVAL;
> }
> paifa |= i;
> @@ -716,7 +716,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
>
> switch (clk_id) {
> case WM8580_CLKSRC_ADCMCLK:
> - if (dai->id != WM8580_DAI_PAIFTX)
> + if (dai->driver->id != WM8580_DAI_PAIFTX)
> return -EINVAL;
> sel = 0 << sel_shift;
> break;
> @@ -735,7 +735,7 @@ static int wm8580_set_sysclk(struct snd_soc_dai *dai, int clk_id,
> }
>
> /* We really should validate PLL settings but not yet */
> - wm8580->sysclk[dai->id] = freq;
> + wm8580->sysclk[dai->driver->id] = freq;
>
> return snd_soc_update_bits(codec, WM8580_CLKSEL, sel_mask, sel);
> }
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
