ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic

All pxa library functions don't use the input parameters for nothing but
slot number. This simplifies their prototypes, and makes them usable by
both the legacy ac97 bus and the new ac97 bus.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 27 insertions, 8 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index fbd5dad0c484..4bc244c40f80 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -29,19 +29,38 @@
 
 #include "pxa2xx-pcm.h"
 
-static void pxa2xx_ac97_reset(struct snd_ac97 *ac97)
+static void pxa2xx_ac97_legacy_reset(struct snd_ac97 *ac97)
 {
-        if (!pxa2xx_ac97_try_cold_reset(ac97)) {
-                pxa2xx_ac97_try_warm_reset(ac97);
-        }
+        if (!pxa2xx_ac97_try_cold_reset())
+                pxa2xx_ac97_try_warm_reset();
+
+        pxa2xx_ac97_finish_reset();
+}
+
+static unsigned short pxa2xx_ac97_legacy_read(struct snd_ac97 *ac97,
+                                              unsigned short reg)
+{
+        int ret;
+
+        ret = pxa2xx_ac97_read(ac97->num, reg);
+        if (ret < 0)
+                return 0;
+        else
+                return (unsigned short)(ret & 0xffff);
+}
+
+static void pxa2xx_ac97_legacy_write(struct snd_ac97 *ac97,
+                                     unsigned short reg, unsigned short val)
+{
+        int __always_unused ret;
 
-        pxa2xx_ac97_finish_reset(ac97);
+        ret = pxa2xx_ac97_write(ac97->num, reg, val);
 }
 
 static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
-        .read   = pxa2xx_ac97_read,
-        .write  = pxa2xx_ac97_write,
-        .reset  = pxa2xx_ac97_reset,
+        .read   = pxa2xx_ac97_legacy_read,
+        .write  = pxa2xx_ac97_legacy_write,
+        .reset  = pxa2xx_ac97_legacy_reset,
 };
 
 static struct pxad_param pxa2xx_ac97_pcm_out_req = {