diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-17 23:40:36 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-17 23:40:36 -0200 |
| commit | 3333dbe217df35d692d56a27cce4735cb9d6b5fb (patch) | |
| tree | 38372c6920aacc60146493d8803f389d755b0650 /linux/drivers/media/video/em28xx/em28xx-core.c | |
| parent | 2ad2e741fe5f88e50ab91f2c5bf2d1a4710f2ebb (diff) | |
| download | mediapointer-dvb-s2-3333dbe217df35d692d56a27cce4735cb9d6b5fb.tar.gz mediapointer-dvb-s2-3333dbe217df35d692d56a27cce4735cb9d6b5fb.tar.bz2 | |
Remove the previous register names
From: Mauro Carvalho Chehab <mchehab@redhat.com>
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.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-core.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index d3fc86b43..8794bfe36 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/drivers/media/video/em28xx/em28xx-core.c @@ -292,11 +292,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; } @@ -312,7 +312,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; @@ -334,7 +334,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; } |