Commit ea27316e authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai
Browse files

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: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f3f7c183

include/sound/tea575x-tuner.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

sound/i2c/other/tea575x-tuner.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

sound/pci/es1968.c

+0 −1
Original line number Diff line number Diff line
@@ -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))

sound/pci/fm801.c

+0 −1
Original line number Diff line number Diff line
@@ -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 &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE