tea575x: use better card and bus names
Subsystems (2)
PATCH 3/3 tea575x: use better card and bus names
Provide real card and bus_info instead of hardcoded values.
Signed-off-by Ondrej Zary <[email protected]>
include/sound/tea575x-tuner.h +2 -0
@@ -52,6 +52,8 @@ struct snd_tea575x {unsigned long in_use;/* set if the device is in use */ struct snd_tea575x_ops *ops;void *private_data; +u8 card[32 ]; +u8 bus_info[32 ]; };int snd_tea575x_init (struct snd_tea575x *tea);
sound/i2c/other/tea575x-tuner.c +3 -2
@@ -178,8 +178,9 @@ static int vidioc_querycap(struct file *struct snd_tea575x *tea =video_drvdata (file);strlcpy (v->driver,"tea575x-tuner" ,sizeof (v->driver)); -strlcpy (v->card, tea->tea5759 ?"TEA5759" :"TEA5757" ,sizeof (v->card)); -sprintf (v->bus_info,"PCI" ); +strlcpy (v->card, tea->card,sizeof (v->card)); +strlcat (v->card, tea->tea5759 ?" TEA5759" :" TEA5757" ,sizeof (v->card)); +strlcpy (v->bus_info, tea->bus_info,sizeof (v->bus_info)); v->version =RADIO_VERSION ; v->capabilities =V4L2_CAP_TUNER |V4L2_CAP_RADIO ;return 0 ;
sound/pci/es1968.c +2 -0
@@ -2795,6 +2795,8 @@ static int __devinit snd_es1968_create(s#ifdef CONFIG_SND_ES1968_RADIO chip->tea.private_data = chip; chip->tea.ops = &snd_es1968_tea_ops; +strlcpy (chip->tea.card,"SF64-PCE2" ,sizeof (chip->tea.card)); +sprintf (chip->tea.bus_info,"PCI:%s" ,pci_name (pci));if (!snd_tea575x_init (&chip->tea))printk (KERN_INFO "es1968: detected TEA575x radio\n" );#endif
sound/pci/fm801.c +2 -0
@@ -1232,6 +1232,7 @@ static int __devinit snd_fm801_create(st#ifdef TEA575X_RADIO chip->tea.private_data = chip; chip->tea.ops = &snd_fm801_tea_ops; +sprintf (chip->tea.bus_info,"PCI:%s" ,pci_name (pci));if ((tea575x_tuner &TUNER_TYPE_MASK ) >0 && (tea575x_tuner &TUNER_TYPE_MASK ) <4 ) {if (snd_tea575x_init (&chip->tea))
@@ -1246,6 +1247,7 @@ static int __devinit snd_fm801_create(st break; } } +strlcpy (chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner &TUNER_TYPE_MASK ) -1 ].name,sizeof (chip->tea.card));#endif *rchip = chip;
Signature · 1 line
Ondrej Zary