diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2011-05-12 16:17:56 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-13 13:43:01 -0400 |
commit | ea27316e4cd13b25727715c0db8adb0b1661f5e7 (patch) | |
tree | 724f1ba4420b310ebd6041a21993c4f7aae3a6ef /sound | |
parent | f3f7c1837f6bcae3601fc535b339426868bf1549 (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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/i2c/other/tea575x-tuner.c | 8 | ||||
-rw-r--r-- | sound/pci/es1968.c | 1 | ||||
-rw-r--r-- | sound/pci/fm801.c | 1 |
3 files changed, 4 insertions, 6 deletions
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) | |||
141 | freq /= 10; | 141 | freq /= 10; |
142 | /* crystal fixup */ | 142 | /* crystal fixup */ |
143 | if (tea->tea5759) | 143 | if (tea->tea5759) |
144 | freq += tea->freq_fixup; | 144 | freq += TEA575X_FMIF; |
145 | else | 145 | else |
146 | freq -= tea->freq_fixup; | 146 | freq -= TEA575X_FMIF; |
147 | 147 | ||
148 | tea->freq = freq * 16; /* from kHz */ | 148 | tea->freq = freq * 16; /* from kHz */ |
149 | } | 149 | } |
@@ -156,9 +156,9 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea) | |||
156 | freq /= 16; /* to kHz */ | 156 | freq /= 16; /* to kHz */ |
157 | /* crystal fixup */ | 157 | /* crystal fixup */ |
158 | if (tea->tea5759) | 158 | if (tea->tea5759) |
159 | freq -= tea->freq_fixup; | 159 | freq -= TEA575X_FMIF; |
160 | else | 160 | else |
161 | freq += tea->freq_fixup; | 161 | freq += TEA575X_FMIF; |
162 | /* freq /= 12.5 */ | 162 | /* freq /= 12.5 */ |
163 | freq *= 10; | 163 | freq *= 10; |
164 | freq /= 125; | 164 | 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, | |||
2794 | 2794 | ||
2795 | #ifdef CONFIG_SND_ES1968_RADIO | 2795 | #ifdef CONFIG_SND_ES1968_RADIO |
2796 | chip->tea.card = card; | 2796 | chip->tea.card = card; |
2797 | chip->tea.freq_fixup = 10700; | ||
2798 | chip->tea.private_data = chip; | 2797 | chip->tea.private_data = chip; |
2799 | chip->tea.ops = &snd_es1968_tea_ops; | 2798 | chip->tea.ops = &snd_es1968_tea_ops; |
2800 | if (!snd_tea575x_init(&chip->tea)) | 2799 | 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, | |||
1231 | 1231 | ||
1232 | #ifdef TEA575X_RADIO | 1232 | #ifdef TEA575X_RADIO |
1233 | chip->tea.card = card; | 1233 | chip->tea.card = card; |
1234 | chip->tea.freq_fixup = 10700; | ||
1235 | chip->tea.private_data = chip; | 1234 | chip->tea.private_data = chip; |
1236 | chip->tea.ops = &snd_fm801_tea_ops; | 1235 | chip->tea.ops = &snd_fm801_tea_ops; |
1237 | if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && | 1236 | if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && |