diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-04 13:58:04 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-04 14:15:44 -0400 |
commit | 949e6bc75fea779b433679601641ea641456283b (patch) | |
tree | fd6061f54fe678b2925d6ddfeb64896da296b7b5 /sound | |
parent | 1520ffd218f4aa53bc7652c0f6454da3cb428337 (diff) |
ASoC: arizona: Rename current rates tables to bclk_rates
They're the rates for the BCLK, not for the sample rate, so rename so that
we don't confuse ourselves.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/arizona.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 3b5730b90686..67760b4ea24c 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
@@ -363,7 +363,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) | |||
363 | return 0; | 363 | return 0; |
364 | } | 364 | } |
365 | 365 | ||
366 | static const int arizona_48k_rates[] = { | 366 | static const int arizona_48k_bclk_rates[] = { |
367 | -1, | 367 | -1, |
368 | 48000, | 368 | 48000, |
369 | 64000, | 369 | 64000, |
@@ -385,7 +385,7 @@ static const int arizona_48k_rates[] = { | |||
385 | 24576000, | 385 | 24576000, |
386 | }; | 386 | }; |
387 | 387 | ||
388 | static const int arizona_44k1_rates[] = { | 388 | static const int arizona_44k1_bclk_rates[] = { |
389 | -1, | 389 | -1, |
390 | 44100, | 390 | 44100, |
391 | 58800, | 391 | 58800, |
@@ -445,17 +445,17 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, | |||
445 | int bclk, lrclk, wl, frame, sr_val; | 445 | int bclk, lrclk, wl, frame, sr_val; |
446 | 446 | ||
447 | if (params_rate(params) % 8000) | 447 | if (params_rate(params) % 8000) |
448 | rates = &arizona_44k1_rates[0]; | 448 | rates = &arizona_44k1_bclk_rates[0]; |
449 | else | 449 | else |
450 | rates = &arizona_48k_rates[0]; | 450 | rates = &arizona_48k_bclk_rates[0]; |
451 | 451 | ||
452 | for (i = 0; i < ARRAY_SIZE(arizona_44k1_rates); i++) { | 452 | for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) { |
453 | if (rates[i] == snd_soc_params_to_bclk(params)) { | 453 | if (rates[i] == snd_soc_params_to_bclk(params)) { |
454 | bclk = i; | 454 | bclk = i; |
455 | break; | 455 | break; |
456 | } | 456 | } |
457 | } | 457 | } |
458 | if (i == ARRAY_SIZE(arizona_44k1_rates)) { | 458 | if (i == ARRAY_SIZE(arizona_44k1_bclk_rates)) { |
459 | arizona_aif_err(dai, "Unsupported sample rate %dHz\n", | 459 | arizona_aif_err(dai, "Unsupported sample rate %dHz\n", |
460 | params_rate(params)); | 460 | params_rate(params)); |
461 | return -EINVAL; | 461 | return -EINVAL; |