Skip to content

L
linux
Commit d29b761e authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] wavefront - Use platform_device 

Modules: Wavefront drivers

Rewrite the probe/remove with platform_device.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 99a0b768
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 125 deletions
sound/isa/wavefront/wavefront.c
View file @ d29b761e
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <sound/core.h> #include <sound/core.h>
...@@ -81,7 +83,6 @@ MODULE_PARM_DESC(fm_port, "FM port #."); ...@@ -81,7 +83,6 @@ MODULE_PARM_DESC(fm_port, "FM port #.");
module_param_array(use_cs4232_midi, bool, NULL, 0444); module_param_array(use_cs4232_midi, bool, NULL, 0444);
MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)"); MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");
static struct snd_card *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
...@@ -240,7 +241,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c ...@@ -240,7 +241,7 @@ snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *c
cs4232_mpu_irq[dev] = pnp_irq(pdev, 0); cs4232_mpu_irq[dev] = pnp_irq(pdev, 0);
} }
snd_printk ("CS4232 MPU: port=0x%lx, irq=%i\n", snd_printk (KERN_INFO "CS4232 MPU: port=0x%lx, irq=%i\n",
cs4232_mpu_port[dev], cs4232_mpu_port[dev],
cs4232_mpu_irq[dev]); cs4232_mpu_irq[dev]);
} }
...@@ -315,7 +316,7 @@ snd_wavefront_new_fx (struct snd_card *card, ...@@ -315,7 +316,7 @@ snd_wavefront_new_fx (struct snd_card *card,
struct snd_hwdep *fx_processor; struct snd_hwdep *fx_processor;
if (snd_wavefront_fx_start (&acard->wavefront)) { if (snd_wavefront_fx_start (&acard->wavefront)) {
snd_printk ("cannot initialize YSS225 FX processor"); snd_printk (KERN_ERR "cannot initialize YSS225 FX processor");
return NULL; return NULL;
} }
...@@ -347,7 +348,7 @@ snd_wavefront_new_midi (struct snd_card *card, ...@@ -347,7 +348,7 @@ snd_wavefront_new_midi (struct snd_card *card,
first = 0; first = 0;
acard->wavefront.midi.base = port; acard->wavefront.midi.base = port;
if (snd_wavefront_midi_start (acard)) { if (snd_wavefront_midi_start (acard)) {
snd_printk ("cannot initialize MIDI interface\n"); snd_printk (KERN_ERR "cannot initialize MIDI interface\n");
return NULL; return NULL;
} }
} }
...@@ -385,42 +386,17 @@ snd_wavefront_free(struct snd_card *card) ...@@ -385,42 +386,17 @@ snd_wavefront_free(struct snd_card *card)
} }
} }
static int __devinit static struct snd_card *snd_wavefront_card_new(int dev)
snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid)
{ {
struct snd_card *card; struct snd_card *card;
snd_wavefront_card_t *acard; snd_wavefront_card_t *acard;
struct snd_cs4231 *chip;
struct snd_hwdep *wavefront_synth;
struct snd_rawmidi *ics2115_internal_rmidi = NULL;
struct snd_rawmidi *ics2115_external_rmidi = NULL;
struct snd_hwdep *fx_processor;
int hw_dev = 0, midi_dev = 0, err;
#ifdef CONFIG_PNP card = snd_card_new (index[dev], id[dev], THIS_MODULE,
if (!isapnp[dev]) {
#endif
if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify CS4232 port\n");
return -EINVAL;
}
if (ics2115_port[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify ICS2115 port\n");
return -ENODEV;
}
#ifdef CONFIG_PNP
}
#endif
card = snd_card_new (index[dev],
id[dev],
THIS_MODULE,
sizeof(snd_wavefront_card_t)); sizeof(snd_wavefront_card_t));
if (card == NULL)
return NULL;
if (card == NULL) { acard = card->private_data;
return -ENOMEM;
}
acard = (snd_wavefront_card_t *)card->private_data;
acard->wavefront.irq = -1; acard->wavefront.irq = -1;
spin_lock_init(&acard->wavefront.irq_lock); spin_lock_init(&acard->wavefront.irq_lock);
init_waitqueue_head(&acard->wavefront.interrupt_sleeper); init_waitqueue_head(&acard->wavefront.interrupt_sleeper);
...@@ -428,18 +404,19 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -428,18 +404,19 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
spin_lock_init(&acard->wavefront.midi.virtual); spin_lock_init(&acard->wavefront.midi.virtual);
card->private_free = snd_wavefront_free; card->private_free = snd_wavefront_free;
#ifdef CONFIG_PNP return card;
if (isapnp[dev]) { }
if (snd_wavefront_pnp (dev, acard, pcard, pid) < 0) {
if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) { static int __devinit
snd_printk ("isapnp detection failed\n"); snd_wavefront_probe (struct snd_card *card, int dev)
snd_card_free (card); {
return -ENODEV; snd_wavefront_card_t *acard = card->private_data;
} struct snd_cs4231 *chip;
} struct snd_hwdep *wavefront_synth;
snd_card_set_dev(card, &pcard->card->dev); struct snd_rawmidi *ics2115_internal_rmidi = NULL;
} struct snd_rawmidi *ics2115_external_rmidi = NULL;
#endif /* CONFIG_PNP */ struct snd_hwdep *fx_processor;
int hw_dev = 0, midi_dev = 0, err;
/* --------- PCM --------------- */ /* --------- PCM --------------- */
...@@ -450,19 +427,15 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -450,19 +427,15 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
dma1[dev], dma1[dev],
dma2[dev], dma2[dev],
CS4231_HW_DETECT, 0, &chip)) < 0) { CS4231_HW_DETECT, 0, &chip)) < 0) {
snd_card_free(card); snd_printk (KERN_ERR "can't allocate CS4231 device\n");
snd_printk ("can't allocate CS4231 device\n");
return err; return err;
} }
if ((err = snd_cs4231_pcm (chip, 0, NULL)) < 0) { if ((err = snd_cs4231_pcm (chip, 0, NULL)) < 0)
snd_card_free(card);
return err; return err;
}
if ((err = snd_cs4231_timer (chip, 0, NULL)) < 0) { if ((err = snd_cs4231_timer (chip, 0, NULL)) < 0)
snd_card_free(card);
return err; return err;
}
/* ---------- OPL3 synth --------- */ /* ---------- OPL3 synth --------- */
...@@ -474,28 +447,26 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -474,28 +447,26 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
fm_port[dev] + 2, fm_port[dev] + 2,
OPL3_HW_OPL3_CS, OPL3_HW_OPL3_CS,
0, &opl3)) < 0) { 0, &opl3)) < 0) {
snd_printk ("can't allocate or detect OPL3 synth\n"); snd_printk (KERN_ERR "can't allocate or detect OPL3 synth\n");
snd_card_free(card);
return err; return err;
} }
if ((err = snd_opl3_hwdep_new(opl3, hw_dev, 1, NULL)) < 0) { if ((err = snd_opl3_hwdep_new(opl3, hw_dev, 1, NULL)) < 0)
snd_card_free(card);
return err; return err;
}
hw_dev++; hw_dev++;
} }
/* ------- ICS2115 Wavetable synth ------- */ /* ------- ICS2115 Wavetable synth ------- */
if ((acard->wavefront.res_base = request_region(ics2115_port[dev], 16, "ICS2115")) == NULL) { if ((acard->wavefront.res_base = request_region(ics2115_port[dev], 16,
snd_printk("unable to grab ICS2115 i/o region 0x%lx-0x%lx\n", ics2115_port[dev], ics2115_port[dev] + 16 - 1); "ICS2115")) == NULL) {
snd_card_free(card); snd_printk(KERN_ERR "unable to grab ICS2115 i/o region 0x%lx-0x%lx\n",
ics2115_port[dev], ics2115_port[dev] + 16 - 1);
return -EBUSY; return -EBUSY;
} }
if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt, SA_INTERRUPT, "ICS2115", (void *)acard)) { if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
snd_printk("unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]); SA_INTERRUPT, "ICS2115", acard)) {
snd_card_free(card); snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
return -EBUSY; return -EBUSY;
} }
...@@ -503,8 +474,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -503,8 +474,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
acard->wavefront.base = ics2115_port[dev]; acard->wavefront.base = ics2115_port[dev];
if ((wavefront_synth = snd_wavefront_new_synth (card, hw_dev, acard)) == NULL) { if ((wavefront_synth = snd_wavefront_new_synth (card, hw_dev, acard)) == NULL) {
snd_printk ("can't create WaveFront synth device\n"); snd_printk (KERN_ERR "can't create WaveFront synth device\n");
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
...@@ -515,8 +485,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -515,8 +485,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
/* --------- Mixer ------------ */ /* --------- Mixer ------------ */
if ((err = snd_cs4231_mixer(chip)) < 0) { if ((err = snd_cs4231_mixer(chip)) < 0) {
snd_printk ("can't allocate mixer device\n"); snd_printk (KERN_ERR "can't allocate mixer device\n");
snd_card_free(card);
return err; return err;
} }
...@@ -528,8 +497,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -528,8 +497,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
cs4232_mpu_irq[dev], cs4232_mpu_irq[dev],
SA_INTERRUPT, SA_INTERRUPT,
NULL)) < 0) { NULL)) < 0) {
snd_printk ("can't allocate CS4232 MPU-401 device\n"); snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
snd_card_free(card);
return err; return err;
} }
midi_dev++; midi_dev++;
...@@ -545,8 +513,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -545,8 +513,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
ics2115_port[dev], ics2115_port[dev],
internal_mpu); internal_mpu);
if (ics2115_internal_rmidi == NULL) { if (ics2115_internal_rmidi == NULL) {
snd_printk ("can't setup ICS2115 internal MIDI device\n"); snd_printk (KERN_ERR "can't setup ICS2115 internal MIDI device\n");
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
midi_dev++; midi_dev++;
...@@ -562,8 +529,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -562,8 +529,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
ics2115_port[dev], ics2115_port[dev],
external_mpu); external_mpu);
if (ics2115_external_rmidi == NULL) { if (ics2115_external_rmidi == NULL) {
snd_printk ("can't setup ICS2115 external MIDI device\n"); snd_printk (KERN_ERR "can't setup ICS2115 external MIDI device\n");
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
midi_dev++; midi_dev++;
...@@ -577,8 +543,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -577,8 +543,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
acard, acard,
ics2115_port[dev]); ics2115_port[dev]);
if (fx_processor == NULL) { if (fx_processor == NULL) {
snd_printk ("can't setup FX device\n"); snd_printk (KERN_ERR "can't setup FX device\n");
snd_card_free(card);
return -ENOMEM; return -ENOMEM;
} }
...@@ -619,49 +584,97 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard, ...@@ -619,49 +584,97 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
ics2115_port[dev], ics2115_port[dev],
ics2115_irq[dev]); ics2115_irq[dev]);
if ((err = snd_card_set_generic_dev(card)) < 0) { return snd_card_register(card);
snd_card_free(card); }
return err;
static int __init snd_wavefront_nonpnp_probe(struct platform_device *pdev)
{
int dev = pdev->id;
struct snd_card *card;
int err;
if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify CS4232 port\n");
return -EINVAL;
}
if (ics2115_port[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify ICS2115 port\n");
return -ENODEV;
} }
if ((err = snd_card_register(card)) < 0) { card = snd_wavefront_card_new(dev);
if (! card)
return -ENOMEM;
snd_card_set_dev(card, &pdev->dev);
if ((err = snd_wavefront_probe(card, dev)) < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
if (pcard)
pnp_set_card_drvdata(pcard, card); platform_set_drvdata(pdev, card);
else return 0;
snd_wavefront_legacy[dev] = card; }
static int __devexit snd_wavefront_nonpnp_remove(struct platform_device *devptr)
{
snd_card_free(platform_get_drvdata(devptr));
platform_set_drvdata(devptr, NULL);
return 0; return 0;
} }
#define WAVEFRONT_DRIVER "snd_wavefront"
static struct platform_driver snd_wavefront_driver = {
.probe = snd_wavefront_nonpnp_probe,
.remove = __devexit_p(snd_wavefront_nonpnp_remove),
/* FIXME: suspend, resume */
.driver = {
.name = WAVEFRONT_DRIVER
},
};
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *card, static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *id) const struct pnp_card_device_id *pid)
{ {
static int dev; static int dev;
struct snd_card *card;
int res; int res;
for ( ; dev < SNDRV_CARDS; dev++) { for ( ; dev < SNDRV_CARDS; dev++) {
if (!enable[dev] || !isapnp[dev]) if (enable[dev] && isapnp[dev])
continue; break;
res = snd_wavefront_probe(dev, card, id);
if (res < 0)
return res;
dev++;
return 0;
} }
if (dev >= SNDRV_CARDS)
return -ENODEV;
card = snd_wavefront_card_new(dev);
if (! card)
return -ENOMEM;
if (snd_wavefront_pnp (dev, card->private_data, pcard, pid) < 0) {
if (cs4232_pcm_port[dev] == SNDRV_AUTO_PORT) {
snd_printk (KERN_ERR "isapnp detection failed\n");
snd_card_free (card);
return -ENODEV; return -ENODEV;
}
}
snd_card_set_dev(card, &pcard->card->dev);
if ((res = snd_wavefront_probe(card, dev)) < 0)
return res;
pnp_set_card_drvdata(pcard, card);
dev++;
return 0;
} }
static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard) static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)
{ {
struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard); snd_card_free(pnp_get_card_drvdata(pcard));
pnp_set_card_drvdata(pcard, NULL);
snd_card_disconnect(card);
snd_card_free_in_thread(card);
} }
static struct pnp_card_driver wavefront_pnpc_driver = { static struct pnp_card_driver wavefront_pnpc_driver = {
...@@ -670,31 +683,40 @@ static struct pnp_card_driver wavefront_pnpc_driver = { ...@@ -670,31 +683,40 @@ static struct pnp_card_driver wavefront_pnpc_driver = {
.id_table = snd_wavefront_pnpids, .id_table = snd_wavefront_pnpids,
.probe = snd_wavefront_pnp_detect, .probe = snd_wavefront_pnp_detect,
.remove = __devexit_p(snd_wavefront_pnp_remove), .remove = __devexit_p(snd_wavefront_pnp_remove),
/* FIXME: suspend,resume */
}; };
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
static int __init alsa_card_wavefront_init(void) static int __init alsa_card_wavefront_init(void)
{ {
int cards = 0; int i, err, cards = 0;
int dev;
for (dev = 0; dev < SNDRV_CARDS; dev++) { if ((err = platform_driver_register(&snd_wavefront_driver)) < 0)
if (!enable[dev]) return err;
continue;
for (i = 0; i < SNDRV_CARDS && enable[i]; i++) {
struct platform_device *device;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
if (isapnp[dev]) if (isapnp[i])
continue; continue;
#endif #endif
if (snd_wavefront_probe(dev, NULL, NULL) >= 0) device = platform_device_register_simple(WAVEFRONT_DRIVER,
i, NULL, 0);
if (IS_ERR(device)) {
platform_driver_unregister(&snd_wavefront_driver);
return PTR_ERR(device);
}
cards++; cards++;
} }
#ifdef CONFIG_PNP
cards += pnp_register_card_driver(&wavefront_pnpc_driver); i = pnp_register_card_driver(&wavefront_pnpc_driver);
#endif if (i > 0)
cards += i;
if (!cards) { if (!cards) {
#ifdef CONFIG_PNP
pnp_unregister_card_driver(&wavefront_pnpc_driver); pnp_unregister_card_driver(&wavefront_pnpc_driver);
#endif platform_driver_unregister(&snd_wavefront_driver);
#ifdef MODULE #ifdef MODULE
printk (KERN_ERR "No WaveFront cards found or devices busy\n"); printk (KERN_ERR "No WaveFront cards found or devices busy\n");
#endif #endif
...@@ -705,13 +727,8 @@ static int __init alsa_card_wavefront_init(void) ...@@ -705,13 +727,8 @@ static int __init alsa_card_wavefront_init(void)
static void __exit alsa_card_wavefront_exit(void) static void __exit alsa_card_wavefront_exit(void)
{ {
int idx;
#ifdef CONFIG_PNP
pnp_unregister_card_driver(&wavefront_pnpc_driver); pnp_unregister_card_driver(&wavefront_pnpc_driver);
#endif platform_driver_unregister(&snd_wavefront_driver);
for (idx = 0; idx < SNDRV_CARDS; idx++)
snd_card_free(snd_wavefront_legacy[idx]);
} }
module_init(alsa_card_wavefront_init) module_init(alsa_card_wavefront_init)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7