ALSA: ac97_codec: merge WM9703 and WM9705 ops
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Fri, 1 Jan 2010 18:05:43 +0000 (19:05 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 8 Jan 2010 07:53:16 +0000 (08:53 +0100)
The WM9705 and WM9703 ops are the same actually so use
the same code for both.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
sound/pci/ac97/ac97_patch.c

index 139cf3b..e288a55 100644 (file)
@@ -544,25 +544,10 @@ static int patch_wolfson04(struct snd_ac97 * ac97)
        return 0;
 }
 
-static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97)
-{
-       int err, i;
-       for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
-               if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm97xx_snd_ac97_controls[i], ac97))) < 0)
-                       return err;
-       }
-       snd_ac97_write_cache(ac97,  0x72, 0x0808);
-       return 0;
-}
-
-static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
-       .build_specific = patch_wolfson_wm9705_specific,
-};
-
 static int patch_wolfson05(struct snd_ac97 * ac97)
 {
        /* WM9705, WM9710 */
-       ac97->build_ops = &patch_wolfson_wm9705_ops;
+       ac97->build_ops = &patch_wolfson_wm9703_ops;
 #ifdef CONFIG_TOUCHSCREEN_WM9705
        /* WM9705 touchscreen uses AUX and VIDEO for touch */
        ac97->flags |= AC97_HAS_NO_VIDEO | AC97_HAS_NO_AUX;