ALSA: fm801: clean-up radio-related Kconfig

Remove TEA575X_RADIO define from fm801.c.
Also update Kconfig help text to include all supported cards.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index f9f533f..ef41825 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -560,8 +560,8 @@ config SND_FM801_TEA575X_BOOL
        depends on VIDEO_V4L2=y || VIDEO_V4L2=SND_FM801
        help
          Say Y here to include support for soundcards based on the ForteMedia
-         FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
-         Forte SF256-PCS-02) into the snd-fm801 driver.
+         FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
+         SF64-PCR) into the snd-fm801 driver.
 
 config SND_TEA575X
        tristate

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 05553da..eacd490 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -196,7 +195,7 @@ struct fm801 {
        spinlock_t reg_lock;
        struct snd_info_entry *proc_entry;
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
        struct snd_tea575x tea;
 #endif
 
@@ -715,7 +714,7 @@ static int __devinit snd_fm801_pcm(struct fm801 *chip, int device, struct snd_pc
  *  TEA5757 radio
  */
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
 
 /* GPIO to TEA575x maps */
 struct snd_fm801_tea575x_gpio {
@@ -1150,7 +1149,7 @@ static int snd_fm801_free(struct fm801 *chip)
        outw(cmdw, FM801_REG(chip, IRQ_MASK));
 
       __end_hw:
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
        snd_tea575x_exit(&chip->tea);
 #endif
        if (chip->irq >= 0)
@@ -1229,7 +1228,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
 
        snd_card_set_dev(card, &pci->dev);
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_TEA575X_BOOL
        chip->tea.private_data = chip;
        chip->tea.ops = &snd_fm801_tea_ops;
        sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));