1 files changed, 12 insertions, 24 deletions

diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 3cc69a626454..9ef20dbccbe3 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -202,19 +202,21 @@ static struct snd_soc_dai_driver ad1980_dai = {
                 .formats = SND_SOC_STD_AC97_FMTS, },
 };
 
+#define AD1980_VENDOR_ID 0x41445300
+#define AD1980_VENDOR_MASK 0xffffff00
+
 static int ad1980_reset(struct snd_soc_codec *codec, int try_warm)
 {
         struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
         unsigned int retry_cnt = 0;
+        int ret;
 
         do {
-                if (try_warm && soc_ac97_ops->warm_reset) {
-                        soc_ac97_ops->warm_reset(ac97);
-                        if (snd_soc_read(codec, AC97_RESET) == 0x0090)
-                                return 1;
-                }
+                ret = snd_ac97_reset(ac97, true, AD1980_VENDOR_ID,
+                        AD1980_VENDOR_MASK);
+                if (ret >= 0)
+                        return 0;
 
-                soc_ac97_ops->reset(ac97);
                 /*
                  * Set bit 16slot in register 74h, then every slot will has only
                  * 16 bits. This command is sent out in 20bit mode, in which
@@ -223,8 +225,6 @@ static int ad1980_reset(struct snd_soc_codec *codec, int try_warm)
                  */
                 snd_soc_write(codec, AC97_AD_SERIAL_CFG, 0x9900);
 
-                if (snd_soc_read(codec, AC97_RESET)  == 0x0090)
-                        return 0;
         } while (retry_cnt++ < 10);
 
         dev_err(codec->dev, "Failed to reset: AC97 link error\n");
@@ -240,7 +240,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
         u16 vendor_id2;
         u16 ext_status;
 
-        ac97 = snd_soc_new_ac97_codec(codec);
+        ac97 = snd_soc_new_ac97_codec(codec, 0, 0);
         if (IS_ERR(ac97)) {
                 ret = PTR_ERR(ac97);
                 dev_err(codec->dev, "Failed to register AC97 codec: %d\n", ret);
@@ -260,22 +260,10 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec)
         if (ret < 0)
                 goto reset_err;
 
-        /* Read out vendor ID to make sure it is ad1980 */
-        if (snd_soc_read(codec, AC97_VENDOR_ID1) != 0x4144) {
-                ret = -ENODEV;
-                goto reset_err;
-        }
-
         vendor_id2 = snd_soc_read(codec, AC97_VENDOR_ID2);
-
-        if (vendor_id2 != 0x5370) {
-                if (vendor_id2 != 0x5374) {
-                        ret = -ENODEV;
-                        goto reset_err;
-                } else {
-                        dev_warn(codec->dev,
-                                "Found AD1981 - only 2/2 IN/OUT Channels supported\n");
-                }
+        if (vendor_id2 == 0x5374) {
+                dev_warn(codec->dev,
+                        "Found AD1981 - only 2/2 IN/OUT Channels supported\n");
         }
 
         /* unmute captures and playbacks volume */