Commit 89751113 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6fbcebf0
...@@ -304,11 +304,11 @@ static int em28xx_set_audio_source(struct em28xx *dev) ...@@ -304,11 +304,11 @@ static int em28xx_set_audio_source(struct em28xx *dev)
/* Sets AC97 mixer registers /* Sets AC97 mixer registers
This is seems to be needed, even for non-ac97 configs 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) if (ret < 0)
return ret; return ret;
ret = em28xx_write_ac97(dev, EM28XX_R10_LINE_IN_AC97, line); ret = em28xx_write_ac97(dev, AC97_LINEIN_VOL, line);
return ret; return ret;
} }
...@@ -324,7 +324,7 @@ int em28xx_audio_analog_set(struct em28xx *dev) ...@@ -324,7 +324,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
/* Mute */ /* Mute */
s[1] |= 0x80; 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) if (ret < 0)
return ret; return ret;
...@@ -346,7 +346,7 @@ int em28xx_audio_analog_set(struct em28xx *dev) ...@@ -346,7 +346,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
/* Unmute device */ /* Unmute device */
if (!dev->mute) if (!dev->mute)
s[1] &= ~0x80; s[1] &= ~0x80;
ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s); ret = em28xx_write_ac97(dev, AC97_MASTER_VOL, s);
return ret; return ret;
} }
......
...@@ -78,11 +78,6 @@ ...@@ -78,11 +78,6 @@
0x47 IR data 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 */ /* em2874 registers */
#define EM2874_R50_IR_CONFIG 0x50 #define EM2874_R50_IR_CONFIG 0x50
#define EM2874_R51_IR 0x51 #define EM2874_R51_IR 0x51
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment