V4L/DVB (9643): em28xx: remove the previous register names

Previously, AC97 registers were named as if they were part of em28xx
device, generating some confusion. Replace such names for a more general
naming convention.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index d4dee84..4de1b2d 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -304,11 +304,11 @@ static int em28xx_set_audio_source(struct em28xx *dev)
        /* Sets AC97 mixer registers
           This is seems to be needed, even for non-ac97 configs
         */
-       ret = em28xx_write_ac97(dev, EM28XX_R14_VIDEO_AC97, video);
+       ret = em28xx_write_ac97(dev, AC97_VIDEO_VOL, video);
        if (ret < 0)
                return ret;
 
-       ret = em28xx_write_ac97(dev, EM28XX_R10_LINE_IN_AC97, line);
+       ret = em28xx_write_ac97(dev, AC97_LINEIN_VOL, line);
 
        return ret;
 }
@@ -324,7 +324,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
 
        /* Mute */
        s[1] |= 0x80;
-       ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
+       ret = em28xx_write_ac97(dev, AC97_MASTER_VOL, s);
 
        if (ret < 0)
                return ret;
@@ -346,7 +346,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
        /* Unmute device */
        if (!dev->mute)
                s[1] &= ~0x80;
-       ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
+       ret = em28xx_write_ac97(dev, AC97_MASTER_VOL, s);
 
        return ret;
 }

diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 763e579..fcab099 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -78,11 +78,6 @@
           0x47  IR data
         */
 
-/* em202 registers */
-#define EM28XX_R02_MASTER_AC97 0x02
-#define EM28XX_R10_LINE_IN_AC97    0x10
-#define EM28XX_R14_VIDEO_AC97  0x14
-
 /* em2874 registers */
 #define EM2874_R50_IR_CONFIG    0x50
 #define EM2874_R51_IR           0x51