summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2011-05-12 22:17:56 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-13 19:43:01 +0200
commitea27316e4cd13b25727715c0db8adb0b1661f5e7 (patch)
tree724f1ba4420b310ebd6041a21993c4f7aae3a6ef
parentf3f7c1837f6bcae3601fc535b339426868bf1549 (diff)
ALSA: tea575x: remove freq_fixup from struct
freq_fixup is a constant, no need to hold it in struct snd_tea575x and set in each driver. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/sound/tea575x-tuner.h3
-rw-r--r--sound/i2c/other/tea575x-tuner.c8
-rw-r--r--sound/pci/es1968.c1
-rw-r--r--sound/pci/fm801.c1
4 files changed, 6 insertions, 7 deletions
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index e50cb2934efe..0291f48e035e 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -26,6 +26,8 @@
#include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h>
+#define TEA575X_FMIF 10700
+
#define TEA575X_DATA (1 << 0)
#define TEA575X_CLK (1 << 1)
#define TEA575X_WREN (1 << 2)
@@ -46,7 +48,6 @@ struct snd_tea575x {
bool mute; /* Device is muted? */
bool stereo; /* receiving stereo */
bool tuned; /* tuned to a station */
- unsigned int freq_fixup; /* crystal onboard */
unsigned int val; /* hw value */
unsigned long freq; /* frequency */
unsigned long in_use; /* set if the device is in use */
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 31f9795daca6..98ccec27e7bf 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -141,9 +141,9 @@ static void snd_tea575x_get_freq(struct snd_tea575x *tea)
freq /= 10;
/* crystal fixup */
if (tea->tea5759)
- freq += tea->freq_fixup;
+ freq += TEA575X_FMIF;
else
- freq -= tea->freq_fixup;
+ freq -= TEA575X_FMIF;
tea->freq = freq * 16; /* from kHz */
}
@@ -156,9 +156,9 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
freq /= 16; /* to kHz */
/* crystal fixup */
if (tea->tea5759)
- freq -= tea->freq_fixup;
+ freq -= TEA575X_FMIF;
else
- freq += tea->freq_fixup;
+ freq += TEA575X_FMIF;
/* freq /= 12.5 */
freq *= 10;
freq /= 125;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 75c5e0ed6955..3f3ff1bae814 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2794,7 +2794,6 @@ static int __devinit snd_es1968_create(struct snd_card *card,
#ifdef CONFIG_SND_ES1968_RADIO
chip->tea.card = card;
- chip->tea.freq_fixup = 10700;
chip->tea.private_data = chip;
chip->tea.ops = &snd_es1968_tea_ops;
if (!snd_tea575x_init(&chip->tea))
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 5aa3fd6f25f7..1d4e71cc18b6 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1231,7 +1231,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
#ifdef TEA575X_RADIO
chip->tea.card = card;
- chip->tea.freq_fixup = 10700;
chip->tea.private_data = chip;
chip->tea.ops = &snd_fm801_tea_ops;
if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&