leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: tea575x: remove freq_fixup from struct

Browse Source 
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>
This commit is contained in:
Ondrej Zary 2011-05-12 22:17:56 +02:00 committed by Takashi Iwai
parent f3f7c1837f
commit ea27316e4c
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/tea575x-tuner.h
View File

@ -26,6 +26,8 @@
#include <media/v4l2-dev.h> #include <media/v4l2-dev.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#define TEA575X_FMIF 10700
#define TEA575X_DATA (1 << 0) #define TEA575X_DATA (1 << 0)
#define TEA575X_CLK (1 << 1) #define TEA575X_CLK (1 << 1)
#define TEA575X_WREN (1 << 2) #define TEA575X_WREN (1 << 2)
@ -46,7 +48,6 @@ struct snd_tea575x {
bool mute; /* Device is muted? */ bool mute; /* Device is muted? */
bool stereo; /* receiving stereo */ bool stereo; /* receiving stereo */
bool tuned; /* tuned to a station */ bool tuned; /* tuned to a station */
unsigned int freq_fixup; /* crystal onboard */
unsigned int val; /* hw value */ unsigned int val; /* hw value */
unsigned long freq; /* frequency */ unsigned long freq; /* frequency */
unsigned long in_use; /* set if the device is in use */ unsigned long in_use; /* set if the device is in use */

8
sound/i2c/other/tea575x-tuner.c
View File

@ -141,9 +141,9 @@ static void snd_tea575x_get_freq(struct snd_tea575x *tea)
freq /= 10; freq /= 10;
/* crystal fixup */ /* crystal fixup */
if (tea->tea5759) if (tea->tea5759)
freq += tea->freq_fixup; freq += TEA575X_FMIF;
else else
freq -= tea->freq_fixup; freq -= TEA575X_FMIF;
tea->freq = freq * 16; /* from kHz */ tea->freq = freq * 16; /* from kHz */
} }
@ -156,9 +156,9 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea)
freq /= 16; /* to kHz */ freq /= 16; /* to kHz */
/* crystal fixup */ /* crystal fixup */
if (tea->tea5759) if (tea->tea5759)
freq -= tea->freq_fixup; freq -= TEA575X_FMIF;
else else
freq += tea->freq_fixup; freq += TEA575X_FMIF;
/* freq /= 12.5 */ /* freq /= 12.5 */
freq *= 10; freq *= 10;
freq /= 125; freq /= 125;

1
sound/pci/es1968.c
View File

@ -2794,7 +2794,6 @@ static int __devinit snd_es1968_create(struct snd_card *card,
#ifdef CONFIG_SND_ES1968_RADIO #ifdef CONFIG_SND_ES1968_RADIO
chip->tea.card = card; chip->tea.card = card;
chip->tea.freq_fixup = 10700;
chip->tea.private_data = chip; chip->tea.private_data = chip;
chip->tea.ops = &snd_es1968_tea_ops; chip->tea.ops = &snd_es1968_tea_ops;
if (!snd_tea575x_init(&chip->tea)) if (!snd_tea575x_init(&chip->tea))

1
sound/pci/fm801.c
View File

@ -1231,7 +1231,6 @@ static int __devinit snd_fm801_create(struct snd_card *card,
#ifdef TEA575X_RADIO #ifdef TEA575X_RADIO
chip->tea.card = card; chip->tea.card = card;
chip->tea.freq_fixup = 10700;
chip->tea.private_data = chip; chip->tea.private_data = chip;
chip->tea.ops = &snd_fm801_tea_ops; chip->tea.ops = &snd_fm801_tea_ops;
if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&