Skip to contentSkip to conversation

fm801: clean-up radio-related Kconfig

PATCH Superseded Ondrej Zary 2 participants 4 messages May 13, 2011 – May 15, 2011

Subsystems (2)
Media (V4L/DVB) Sound
lore
Share & tools
lore

Ondrej Zary

author
#0 lore raw

PATCH 1/1 fm801: clean-up radio-related Kconfig

Change the weird SND_FM801_TEA575X_BOOL define in Kconfig to SND_FM801_RADIO and remove TEA575X_RADIO define from fm801.c.
Also update help text to include all supported cards.

Signed-off-by Ondrej Zary <[email protected]>
sound/pci/Kconfig +4 -4
@@ -554,18 +554,18 @@ config SND_FM801
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-fm801.
 
-config SND_FM801_TEA575X_BOOL
+config SND_FM801_RADIO
 	bool "ForteMedia FM801 + TEA5757 tuner"
 	depends on SND_FM801
 	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
-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO
+	depends on SND_FM801_RADIO || SND_ES1968_RADIO
 	default SND_FM801 || SND_ES1968
 
 source "sound/pci/hda/Kconfig"
sound/pci/fm801.c +5 -6
@@ -36,9 +36,8 @@
 
 #include <asm/io.h>
 
-#ifdef CONFIG_SND_FM801_TEA575X_BOOL
+#ifdef CONFIG_SND_FM801_RADIO
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");

@@ -196,7 +195,7 @@ struct fm801 {
 	spinlock_t reg_lock;
 	struct snd_info_entry *proc_entry;
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	struct snd_tea575x tea;
 #endif
 

@@ -715,7 +714,7 @@ static int __devinit snd_fm801_pcm(struc
  *  TEA5757 radio
  */
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 
 /* GPIO to TEA575x maps */
 struct snd_fm801_tea575x_gpio {

@@ -1150,7 +1149,7 @@ static int snd_fm801_free(struct fm801 *
 	outw(cmdw, FM801_REG(chip, IRQ_MASK));
 
       __end_hw:
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	snd_tea575x_exit(&chip->tea);
 #endif
 	if (chip->irq >= 0)

@@ -1229,7 +1228,7 @@ static int __devinit snd_fm801_create(st
 
 	snd_card_set_dev(card, &pci->dev);
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	chip->tea.private_data = chip;
 	chip->tea.ops = &snd_fm801_tea_ops;
 	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
Signature · 1 line
Ondrej Zary
#1 lore raw

At Fri, 13 May 2011 20:26:38 +0200,

Quoted 3 lines · Ondrej Zary

Change the weird SND_FM801_TEA575X_BOOL define in Kconfig to SND_FM801_RADIO and remove TEA575X_RADIO define from fm801.c.

Well, this config is used over years, and if it's about only renaming, it won't be worth enough.

Removing TEA575X_RADIO in fm801.c is fine, though.

thanks,

Takashi

Quoted 87 lines

Also update help text to include all supported cards.

Signed-off-by Ondrej Zary <[email protected]>
sound/pci/Kconfig +4 -4
@@ -554,18 +554,18 @@ config SND_FM801
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-fm801.
 
-config SND_FM801_TEA575X_BOOL
+config SND_FM801_RADIO
 	bool "ForteMedia FM801 + TEA5757 tuner"
 	depends on SND_FM801
 	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
-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO
+	depends on SND_FM801_RADIO || SND_ES1968_RADIO
 	default SND_FM801 || SND_ES1968
 
 source "sound/pci/hda/Kconfig"
sound/pci/fm801.c +5 -6
@@ -36,9 +36,8 @@
 
 #include <asm/io.h>
 
-#ifdef CONFIG_SND_FM801_TEA575X_BOOL
+#ifdef CONFIG_SND_FM801_RADIO
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");

@@ -196,7 +195,7 @@ struct fm801 {
 	spinlock_t reg_lock;
 	struct snd_info_entry *proc_entry;
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	struct snd_tea575x tea;
 #endif
 

@@ -715,7 +714,7 @@ static int __devinit snd_fm801_pcm(struc
  *  TEA5757 radio
  */
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 
 /* GPIO to TEA575x maps */
 struct snd_fm801_tea575x_gpio {

@@ -1150,7 +1149,7 @@ static int snd_fm801_free(struct fm801 *
 	outw(cmdw, FM801_REG(chip, IRQ_MASK));
 
       __end_hw:
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	snd_tea575x_exit(&chip->tea);
 #endif
 	if (chip->irq >= 0)

@@ -1229,7 +1228,7 @@ static int __devinit snd_fm801_create(st
 
 	snd_card_set_dev(card, &pci->dev);
 
-#ifdef TEA575X_RADIO
+#ifdef CONFIG_SND_FM801_RADIO
 	chip->tea.private_data = chip;
 	chip->tea.ops = &snd_fm801_tea_ops;
 	sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
Signature · 6 lines
-- 
Ondrej Zary
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
author
#2 lore raw

PATCH v2 1/1 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 <[email protected]>
sound/pci/Kconfig +2 -2
@@ -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
sound/pci/fm801.c +4 -5
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");

@@ -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(struc
  *  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 *
 	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(st
 
 	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));
Signature · 1 line
Ondrej Zary
Applied
#3 lore raw

At Sat, 14 May 2011 22:51:01 +0200,

Quoted 5 lines · Ondrej Zary

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

Signed-off-by Ondrej Zary <[email protected]>

Thanks, applied now.

Takashi

Quoted 64 lines
sound/pci/Kconfig +2 -2
@@ -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
sound/pci/fm801.c +4 -5
@@ -38,7 +38,6 @@
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
 #include <sound/tea575x-tuner.h>
-#define TEA575X_RADIO 1
 #endif
 
 MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");

@@ -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(struc
  *  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 *
 	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(st
 
 	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));
Signature · 2 lines
-- 
Ondrej Zary