aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ymfpci/ymfpci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/ymfpci/ymfpci.c')
-rw-r--r--sound/pci/ymfpci/ymfpci.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 9e30e2c76c7f..dab9b8310341 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -31,7 +31,7 @@
31#include <sound/initval.h> 31#include <sound/initval.h>
32 32
33MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); 33MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
34MODULE_DESCRIPTION("Yamaha DS-XG PCI"); 34MODULE_DESCRIPTION("Yamaha DS-1 PCI");
35MODULE_LICENSE("GPL"); 35MODULE_LICENSE("GPL");
36MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724}," 36MODULE_SUPPORTED_DEVICE("{{Yamaha,YMF724},"
37 "{Yamaha,YMF724F}," 37 "{Yamaha,YMF724F},"
@@ -51,11 +51,11 @@ static long joystick_port[SNDRV_CARDS];
51static int rear_switch[SNDRV_CARDS]; 51static int rear_switch[SNDRV_CARDS];
52 52
53module_param_array(index, int, NULL, 0444); 53module_param_array(index, int, NULL, 0444);
54MODULE_PARM_DESC(index, "Index value for the Yamaha DS-XG PCI soundcard."); 54MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard.");
55module_param_array(id, charp, NULL, 0444); 55module_param_array(id, charp, NULL, 0444);
56MODULE_PARM_DESC(id, "ID string for the Yamaha DS-XG PCI soundcard."); 56MODULE_PARM_DESC(id, "ID string for the Yamaha DS-1 PCI soundcard.");
57module_param_array(enable, bool, NULL, 0444); 57module_param_array(enable, bool, NULL, 0444);
58MODULE_PARM_DESC(enable, "Enable Yamaha DS-XG soundcard."); 58MODULE_PARM_DESC(enable, "Enable Yamaha DS-1 soundcard.");
59module_param_array(mpu_port, long, NULL, 0444); 59module_param_array(mpu_port, long, NULL, 0444);
60MODULE_PARM_DESC(mpu_port, "MPU-401 Port."); 60MODULE_PARM_DESC(mpu_port, "MPU-401 Port.");
61module_param_array(fm_port, long, NULL, 0444); 61module_param_array(fm_port, long, NULL, 0444);
@@ -177,7 +177,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
177 struct resource *mpu_res = NULL; 177 struct resource *mpu_res = NULL;
178 struct snd_ymfpci *chip; 178 struct snd_ymfpci *chip;
179 struct snd_opl3 *opl3; 179 struct snd_opl3 *opl3;
180 char *str; 180 const char *str, *model;
181 int err; 181 int err;
182 u16 legacy_ctrl, legacy_ctrl2, old_legacy_ctrl; 182 u16 legacy_ctrl, legacy_ctrl2, old_legacy_ctrl;
183 183
@@ -193,13 +193,13 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
193 return -ENOMEM; 193 return -ENOMEM;
194 194
195 switch (pci_id->device) { 195 switch (pci_id->device) {
196 case 0x0004: str = "YMF724"; break; 196 case 0x0004: str = "YMF724"; model = "DS-1"; break;
197 case 0x000d: str = "YMF724F"; break; 197 case 0x000d: str = "YMF724F"; model = "DS-1"; break;
198 case 0x000a: str = "YMF740"; break; 198 case 0x000a: str = "YMF740"; model = "DS-1L"; break;
199 case 0x000c: str = "YMF740C"; break; 199 case 0x000c: str = "YMF740C"; model = "DS-1L"; break;
200 case 0x0010: str = "YMF744"; break; 200 case 0x0010: str = "YMF744"; model = "DS-1S"; break;
201 case 0x0012: str = "YMF754"; break; 201 case 0x0012: str = "YMF754"; model = "DS-1E"; break;
202 default: str = "???"; break; 202 default: model = str = "???"; break;
203 } 203 }
204 204
205 legacy_ctrl = 0; 205 legacy_ctrl = 0;
@@ -274,7 +274,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
274 card->private_data = chip; 274 card->private_data = chip;
275 275
276 strcpy(card->driver, str); 276 strcpy(card->driver, str);
277 sprintf(card->shortname, "Yamaha DS-XG (%s)", str); 277 sprintf(card->shortname, "Yamaha %s (%s)", model, str);
278 sprintf(card->longname, "%s at 0x%lx, irq %i", 278 sprintf(card->longname, "%s at 0x%lx, irq %i",
279 card->shortname, 279 card->shortname,
280 chip->reg_area_phys, 280 chip->reg_area_phys,
@@ -345,7 +345,7 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
345} 345}
346 346
347static struct pci_driver driver = { 347static struct pci_driver driver = {
348 .name = "Yamaha DS-XG PCI", 348 .name = "Yamaha DS-1 PCI",
349 .id_table = snd_ymfpci_ids, 349 .id_table = snd_ymfpci_ids,
350 .probe = snd_card_ymfpci_probe, 350 .probe = snd_card_ymfpci_probe,
351 .remove = __devexit_p(snd_card_ymfpci_remove), 351 .remove = __devexit_p(snd_card_ymfpci_remove),