Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8960.c

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index cda9cd935d4f3833d517073583060dc339384f30..9e621a254392c77f6747b2a947b5f94505eb3b86 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -608,10 +608,6 @@ static const int bclk_divs[] = {
  *             - lrclk      = sysclk / dac_divs
  *             - 10 * bclk  = sysclk / bclk_divs
  *
- *     If we cannot find an exact match for (sysclk, lrclk, bclk)
- *     triplet, we relax the bclk such that bclk is chosen as the
- *     closest available frequency greater than expected bclk.
- *
  * @wm8960: codec private data
  * @mclk: MCLK used to derive sysclk
  * @sysclk_idx: sysclk_divs index for found sysclk
@@ -629,7 +625,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
 {
        int sysclk, bclk, lrclk;
        int i, j, k;
-       int diff, closest = mclk;
+       int diff;
 
        /* marker for no match */
        *bclk_idx = -1;
@@ -653,12 +649,6 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
                                        *bclk_idx = k;
                                        break;
                                }
-                               if (diff > 0 && closest > diff) {
-                                       *sysclk_idx = i;
-                                       *dac_idx = j;
-                                       *bclk_idx = k;
-                                       closest = diff;
-                               }
                        }
                        if (k != ARRAY_SIZE(bclk_divs))
                                break;