ALSA: More devres usages
Subsystems (6)
PATCH v2 70/79 ALSA: sscape: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the resource management in ISA sscape driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper. The remove callback became superfluous and dropped.
This should give no user-visible functional changes.
--- sound/isa/sscape.c | 92 ++++++++++------------------------------------ 1 file changed, 20 insertions(+), 72 deletions(-)
sound/isa/sscape.c +20 -72
@@ -327,17 +327,6 @@ static void activate_ad1845_unsafe(unsigned io_base)sscape_write_unsafe (io_base,GA_CDCFG_REG ,0x80 ); } -/* -* Do the necessary ALSA-level cleanup to deallocate our driver ... -*/ -static void soundscape_free (struct snd_card *c) -{ -struct soundscape *sscape =get_card_soundscape (c); -release_and_free_resource (sscape->io_res); -release_and_free_resource (sscape->wss_res); -free_dma (sscape->chip->dma1); -} -/* * Tell the SoundScape to begin a DMA transfer using the given channel. * All locking issues are left to the caller.
@@ -941,7 +930,7 @@ static int create_sscape(int dev, struct snd_card *card)* Grab IO ports that we will need to probe so that we * can detect and control this hardware ... */ - io_res =request_region (port[dev],8 ,"SoundScape" ); + io_res =devm_request_region (card->dev, port[dev],8 ,"SoundScape" );if (!io_res) {snd_printk (KERN_ERR "sscape: can't grab port 0x%lx\n" , port[dev]);
@@ -949,22 +938,22 @@ static int create_sscape(int dev, struct snd_card *card) } wss_res =NULL ;if (sscape->type ==SSCAPE_VIVO ) { - wss_res =request_region (wss_port[dev],4 ,"SoundScape" ); + wss_res =devm_request_region (card->dev, wss_port[dev],4 , +"SoundScape" );if (!wss_res) {snd_printk (KERN_ERR "sscape: can't grab port 0x%lx\n" , wss_port[dev]); - err = -EBUSY ; - goto _release_region; +return -EBUSY ; } }/* * Grab one DMA channel ... */ - err =request_dma (dma[dev],"SoundScape" ); + err =snd_devm_request_dma (card->dev, dma[dev],"SoundScape" );if (err <0 ) {snd_printk (KERN_ERR "sscape: can't grab DMA %d\n" , dma[dev]); - goto _release_region; +return err; }spin_lock_init (&sscape->lock);
@@ -975,8 +964,7 @@ static int create_sscape(int dev, struct snd_card *card)if (!detect_sscape (sscape, wss_port[dev])) {printk (KERN_ERR "sscape: hardware not detected at 0x%x\n" , sscape->io_base); - err = -ENODEV ; - goto _release_dma; +return -ENODEV ; }switch (sscape->type) {
@@ -1006,15 +994,13 @@ static int create_sscape(int dev, struct snd_card *card) irq_cfg =get_irq_config (sscape->type, irq[dev]);if (irq_cfg ==INVALID_IRQ ) {snd_printk (KERN_ERR "sscape: Invalid IRQ %d\n" , irq[dev]); - err = -ENXIO ; - goto _release_dma; +return -ENXIO ; } mpu_irq_cfg =get_irq_config (sscape->type, mpu_irq[dev]);if (mpu_irq_cfg ==INVALID_IRQ ) {snd_printk (KERN_ERR "sscape: Invalid IRQ %d\n" , mpu_irq[dev]); - err = -ENXIO ; - goto _release_dma; +return -ENXIO ; }/*
@@ -1060,7 +1046,7 @@ static int create_sscape(int dev, struct snd_card *card)snd_printk (KERN_ERR "sscape: No AD1845 device at 0x%lx, IRQ %d\n" , wss_port[dev], irq[dev]); - goto _release_dma; +return err; }strcpy (card->driver,"SoundScape" );strcpy (card->shortname, name);
@@ -1082,7 +1068,7 @@ static int create_sscape(int dev, struct snd_card *card)snd_printk (KERN_ERR "sscape: Failed to create " "MPU-401 device at 0x%lx\n" , port[dev]); - goto _release_dma; +return err; }/*
@@ -1109,24 +1095,7 @@ static int create_sscape(int dev, struct snd_card *card) } } -/* -* Now that we have successfully created this sound card, -* it is safe to store the pointer. -* NOTE: we only register the sound card's "destructor" -* function now that our "constructor" has completed. -*/ - card->private_free = soundscape_free; -return 0 ; - -_release_dma: -free_dma (dma[dev]); - -_release_region: -release_and_free_resource (wss_res); -release_and_free_resource (io_res); - -return err; }
@@ -1156,8 +1125,8 @@ static int snd_sscape_probe(struct device *pdev, unsigned int dev)struct soundscape *sscape;int ret; - ret =snd_card_new (pdev, index[dev], id[dev],THIS_MODULE , -sizeof (struct soundscape ), &card); + ret =snd_devm_card_new (pdev, index[dev], id[dev],THIS_MODULE , +sizeof (struct soundscape ), &card);if (ret <0 )return ret;
@@ -1168,24 +1137,15 @@ static int snd_sscape_probe(struct device *pdev, unsigned int dev) ret =create_sscape (dev, card);if (ret <0 ) - goto _release_card; +return ret; ret =snd_card_register (card);if (ret <0 ) {snd_printk (KERN_ERR "sscape: Failed to register sound card\n" ); - goto _release_card; +return ret; }dev_set_drvdata (pdev, card);return 0 ; - -_release_card: -snd_card_free (card); -return ret; -} - -static void snd_sscape_remove (struct device *devptr,unsigned int dev) -{ -snd_card_free (dev_get_drvdata (devptr)); }#define DEV_NAME "sscape"
@@ -1193,7 +1153,6 @@ static void snd_sscape_remove(struct device *devptr, unsigned int dev)static struct isa_driver snd_sscape_driver = { .match = snd_sscape_match, .probe = snd_sscape_probe, - .remove = snd_sscape_remove,/* FIXME: suspend/resume */ .driver = { .name =DEV_NAME
@@ -1244,9 +1203,9 @@ static int sscape_pnp_detect(struct pnp_card_link *pcard,* Create a new ALSA sound card entry, in anticipation * of detecting our hardware ... */ - ret =snd_card_new (&pcard->card->dev, - index[idx], id[idx],THIS_MODULE , -sizeof (struct soundscape ), &card); + ret =snd_devm_card_new (&pcard->card->dev, + index[idx], id[idx],THIS_MODULE , +sizeof (struct soundscape ), &card);if (ret <0 )return ret;
@@ -1277,27 +1236,17 @@ static int sscape_pnp_detect(struct pnp_card_link *pcard, ret =create_sscape (idx, card);if (ret <0 ) - goto _release_card; +return ret; ret =snd_card_register (card);if (ret <0 ) {snd_printk (KERN_ERR "sscape: Failed to register sound card\n" ); - goto _release_card; +return ret; }pnp_set_card_drvdata (pcard, card); ++idx;return 0 ; - -_release_card: -snd_card_free (card); -return ret; -} - -static void sscape_pnp_remove (struct pnp_card_link *pcard) -{ -snd_card_free (pnp_get_card_drvdata (pcard)); -pnp_set_card_drvdata (pcard,NULL ); }static struct pnp_card_driver sscape_pnpc_driver = {
@@ -1305,7 +1254,6 @@ static struct pnp_card_driver sscape_pnpc_driver = { .name = "sscape", .id_table = sscape_pnpids, .probe = sscape_pnp_detect, - .remove = sscape_pnp_remove, };#endif /* CONFIG_PNP */
Signature · 1 line
2.26.2
PATCH v2 71/79 ALSA: wavefront: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the resource management in ISA wavefront driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper. The remove callback became superfluous and dropped.
This should give no user-visible functional changes.
--- sound/isa/wavefront/wavefront.c | 46 +++++++-------------------------- 1 file changed, 9 insertions(+), 37 deletions(-)
sound/isa/wavefront/wavefront.c +9 -37
@@ -308,18 +308,6 @@ static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,return rmidi; } -static void -snd_wavefront_free (struct snd_card *card) -{ -snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card->private_data; - -if (acard) { -release_and_free_resource (acard->wavefront.res_base); -if (acard->wavefront.irq >0 ) -free_irq (acard->wavefront.irq, (void *)acard); - } -} -static int snd_wavefront_card_new (struct device *pdev,int dev,struct snd_card **cardp) {
@@ -327,8 +315,8 @@ static int snd_wavefront_card_new(struct device *pdev, int dev,snd_wavefront_card_t *acard;int err; - err =snd_card_new (pdev, index[dev], id[dev],THIS_MODULE , -sizeof (snd_wavefront_card_t), &card); + err =snd_devm_card_new (pdev, index[dev], id[dev],THIS_MODULE , +sizeof (snd_wavefront_card_t), &card);if (err <0 )return err;
@@ -339,7 +327,6 @@ static int snd_wavefront_card_new(struct device *pdev, int dev,spin_lock_init (&acard->wavefront.midi.open);spin_lock_init (&acard->wavefront.midi.virtual); acard->wavefront.card = card; - card->private_free = snd_wavefront_free; *cardp = card;return 0 ;
@@ -394,15 +381,17 @@ snd_wavefront_probe (struct snd_card *card, int dev)/* ------- ICS2115 Wavetable synth ------- */ - acard->wavefront.res_base =request_region (ics2115_port[dev],16 , -"ICS2115" ); + acard->wavefront.res_base = +devm_request_region (card->dev, ics2115_port[dev],16 , +"ICS2115" );if (acard->wavefront.res_base ==NULL ) {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 ; } -if (request_irq (ics2115_irq[dev], snd_wavefront_ics2115_interrupt, -0 ,"ICS2115" , acard)) { +if (devm_request_irq (card->dev, ics2115_irq[dev], + snd_wavefront_ics2115_interrupt, +0 ,"ICS2115" , acard)) {snd_printk (KERN_ERR "unable to use ICS2115 IRQ %d\n" , ics2115_irq[dev]);return -EBUSY ; }
@@ -556,27 +545,18 @@ static int snd_wavefront_isa_probe(struct device *pdev,if (err <0 )return err; err =snd_wavefront_probe (card, dev); -if (err <0 ) { -snd_card_free (card); +if (err <0 )return err; - }dev_set_drvdata (pdev, card);return 0 ; } -static void snd_wavefront_isa_remove (struct device *devptr, -unsigned int dev) -{ -snd_card_free (dev_get_drvdata (devptr)); -} -#define DEV_NAME "wavefront"static struct isa_driver snd_wavefront_driver = { .match = snd_wavefront_isa_match, .probe = snd_wavefront_isa_probe, - .remove = snd_wavefront_isa_remove,/* FIXME: suspend, resume */ .driver = { .name =DEV_NAME
@@ -606,7 +586,6 @@ static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,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 ; } }
@@ -620,18 +599,11 @@ static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,return 0 ; } -static void snd_wavefront_pnp_remove (struct pnp_card_link *pcard) -{ -snd_card_free (pnp_get_card_drvdata (pcard)); -pnp_set_card_drvdata (pcard,NULL ); -} -static struct pnp_card_driver wavefront_pnpc_driver = { .flags =PNP_DRIVER_RES_DISABLE , .name ="wavefront" , .id_table = snd_wavefront_pnpids, .probe = snd_wavefront_pnp_detect, - .remove = snd_wavefront_pnp_remove,/* FIXME: suspend,resume */ };
Signature · 1 line
2.26.2
PATCH v2 72/79 ALSA: x86: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the resource management in x86 HDMI LPE audio driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper now.
--- sound/x86/intel_hdmi_audio.c | 57 ++++++++++-------------------------- 1 file changed, 16 insertions(+), 41 deletions(-)
sound/x86/intel_hdmi_audio.c +16 -41
@@ -1657,11 +1657,6 @@ static void hdmi_lpe_audio_free(struct snd_card *card)cancel_work_sync (&ctx->hdmi_audio_wq); } - -if (card_ctx->mmio_start) -iounmap (card_ctx->mmio_start); -if (card_ctx->irq >=0 ) -free_irq (card_ctx->irq, card_ctx); }/*
@@ -1699,8 +1694,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) }/* create a card instance with ALSA framework */ - ret =snd_card_new (&pdev->dev, hdmi_card_index, hdmi_card_id, -THIS_MODULE ,sizeof (*card_ctx), &card); + ret =snd_devm_card_new (&pdev->dev, hdmi_card_index, hdmi_card_id, +THIS_MODULE ,sizeof (*card_ctx), &card);if (ret)return ret;
@@ -1736,20 +1731,20 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) __func__, (unsigned int )res_mmio->start, (unsigned int)res_mmio->end); - card_ctx->mmio_start =ioremap (res_mmio->start, - (size_t )(resource_size (res_mmio))); + card_ctx->mmio_start = +devm_ioremap (&pdev->dev, res_mmio->start, + (size_t )(resource_size (res_mmio)));if (!card_ctx->mmio_start) {dev_err (&pdev->dev,"Could not get ioremap\n" ); - ret = -EACCES ; - goto err; +return -EACCES ; }/* setup interrupt handler */ - ret =request_irq (irq, display_pipe_interrupt_handler,0 , - pdev->name, card_ctx); + ret =devm_request_irq (&pdev->dev, irq, display_pipe_interrupt_handler, +0 , pdev->name, card_ctx);if (ret <0 ) {dev_err (&pdev->dev,"request_irq failed\n" ); - goto err; +return ret; } card_ctx->irq = irq;
@@ -1769,7 +1764,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) ret =snd_pcm_new (card,INTEL_HAD , port,MAX_PB_STREAMS ,MAX_CAP_STREAMS , &pcm);if (ret) - goto err; +return ret;/* setup private data which can be retrieved when required */ pcm->private_data = ctx;
@@ -1790,31 +1785,29 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)struct snd_kcontrol *kctl; kctl =snd_ctl_new1 (&had_controls[i], ctx); -if (!kctl) { - ret = -ENOMEM ; - goto err; - } +if (!kctl) +return -ENOMEM ; kctl->id.device = pcm->device; ret =snd_ctl_add (card, kctl);if (ret <0 ) - goto err; +return ret; }/* Register channel map controls */ ret =had_register_chmap_ctls (ctx, pcm);if (ret <0 ) - goto err; +return ret; ret =had_create_jack (ctx, pcm);if (ret <0 ) - goto err; +return ret; } ret =snd_card_register (card);if (ret) - goto err; +return ret;spin_lock_irq (&pdata->lpe_audio_slock); pdata->notify_audio_lpe = notify_audio_lpe;
@@ -1831,23 +1824,6 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) }return 0 ; - -err: -snd_card_free (card); -return ret; -} - -/* -* hdmi_lpe_audio_remove - stop bridge with i915 -* -* This function is called when the platform device is destroyed. -*/ -static int hdmi_lpe_audio_remove (struct platform_device *pdev) -{ -struct snd_intelhad_card *card_ctx =platform_get_drvdata (pdev); - -snd_card_free (card_ctx->card); -return 0 ; }static const struct dev_pm_ops hdmi_lpe_audio_pm = {
@@ -1860,7 +1836,6 @@ static struct platform_driver hdmi_lpe_audio_driver = { .pm = &hdmi_lpe_audio_pm, }, .probe = hdmi_lpe_audio_probe, - .remove = hdmi_lpe_audio_remove, };module_platform_driver (hdmi_lpe_audio_driver);
Signature · 1 line
2.26.2
PATCH v2 73/79 ALSA: virmidi: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the card object management with devres as a clean up. The remove callback gets reduced by that.
This should give no user-visible functional changes.
--- sound/drivers/virmidi.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
sound/drivers/virmidi.c +6 -15
@@ -75,8 +75,8 @@ static int snd_virmidi_probe(struct platform_device *devptr)int idx, err;int dev = devptr->id; - err =snd_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , -sizeof (struct snd_card_virmidi ), &card); + err =snd_devm_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , +sizeof (struct snd_card_virmidi ), &card);if (err <0 )return err; vmidi = card->private_data;
@@ -94,7 +94,7 @@ static int snd_virmidi_probe(struct platform_device *devptr) err =snd_virmidi_new (card, idx, &rmidi);if (err <0 ) - goto __nodev; +return err; rdev = rmidi->private_data; vmidi->midi[idx] = rmidi;strcpy (rmidi->name,"Virtual Raw MIDI" );
@@ -106,18 +106,10 @@ static int snd_virmidi_probe(struct platform_device *devptr)sprintf (card->longname,"Virtual MIDI Card %i" , dev +1 ); err =snd_card_register (card); -if (!err) { -platform_set_drvdata (devptr, card); -return 0 ; - } -__nodev: -snd_card_free (card); -return err; -} +if (err) +return err; -static int snd_virmidi_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); +platform_set_drvdata (devptr, card);return 0 ; }
@@ -125,7 +117,6 @@ static int snd_virmidi_remove(struct platform_device *devptr)static struct platform_driver snd_virmidi_driver = { .probe = snd_virmidi_probe, - .remove = snd_virmidi_remove, .driver = { .name =SND_VIRMIDI_DRIVER , },
Signature · 1 line
2.26.2
PATCH v2 74/79 ALSA: mtpav: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the resource management in mtpav driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper now.
This should give no user-visible functional changes.
--- sound/drivers/mtpav.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-)
sound/drivers/mtpav.c +9 -21
@@ -566,13 +566,15 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)*/ static int snd_mtpav_get_ISA (struct mtpav *mcard) { - mcard->res_port =request_region (port,3 ,"MotuMTPAV MIDI" ); + mcard->res_port =devm_request_region (mcard->card->dev, port,3 , +"MotuMTPAV MIDI" );if (!mcard->res_port) {snd_printk (KERN_ERR "MTVAP port 0x%lx is busy\n" , port);return -EBUSY ; } mcard->port = port; -if (request_irq (irq, snd_mtpav_irqh,0 ,"MOTU MTPAV" , mcard)) { +if (devm_request_irq (mcard->card->dev, irq, snd_mtpav_irqh,0 , +"MOTU MTPAV" , mcard)) {snd_printk (KERN_ERR "MTVAP IRQ %d busy\n" , irq);return -EBUSY ; }
@@ -667,9 +669,6 @@ static void snd_mtpav_free(struct snd_card *card)if (crd->istimer >0 )snd_mtpav_remove_output_timer (crd);spin_unlock_irqrestore (&crd->spinlock, flags); -if (crd->irq >=0 ) -free_irq (crd->irq, (void *)crd); -release_and_free_resource (crd->res_port); }/*
@@ -680,8 +679,8 @@ static int snd_mtpav_probe(struct platform_device *dev)int err;struct mtpav *mtp_card; - err =snd_card_new (&dev->dev, index, id,THIS_MODULE , -sizeof (*mtp_card), &card); + err =snd_devm_card_new (&dev->dev, index, id,THIS_MODULE , +sizeof (*mtp_card), &card);if (err <0 )return err;
@@ -698,13 +697,13 @@ static int snd_mtpav_probe(struct platform_device *dev) err =snd_mtpav_get_RAWMIDI (mtp_card);if (err <0 ) - goto __error; +return err; mtp_card->inmidiport = mtp_card->num_ports +MTPAV_PIDX_BROADCAST ; err =snd_mtpav_get_ISA (mtp_card);if (err <0 ) - goto __error; +return err;strcpy (card->driver,"MTPAV" );strcpy (card->shortname,"MTPAV on parallel port" );
@@ -715,28 +714,17 @@ static int snd_mtpav_probe(struct platform_device *dev) err =snd_card_register (mtp_card->card);if (err <0 ) - goto __error; +return err;platform_set_drvdata (dev, card);printk (KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n" , irq, port);return 0 ; - - __error: -snd_card_free (card); -return err; -} - -static int snd_mtpav_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); -return 0 ; }#define SND_MTPAV_DRIVER "snd_mtpav"static struct platform_driver snd_mtpav_driver = { .probe = snd_mtpav_probe, - .remove = snd_mtpav_remove, .driver = { .name =SND_MTPAV_DRIVER , },
Signature · 1 line
2.26.2
PATCH v2 75/79 ALSA: serial-u16550: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the resource management in serial u16550 driver with devres as a clean up. Each manual resource management is converted with the corresponding devres helper, and the card object release is managed now via card->private_free instead of a lowlevel snd_device.
This should give no user-visible functional changes.
--- sound/drivers/serial-u16550.c | 57 ++++++----------------------------- 1 file changed, 9 insertions(+), 48 deletions(-)
sound/drivers/serial-u16550.c +9 -48
@@ -115,7 +115,6 @@ struct snd_uart16550 {int irq;unsigned long base; -struct resource *res_base;unsigned int speed;unsigned int speed_base;
@@ -323,8 +322,7 @@ static int snd_uart16550_detect(struct snd_uart16550 *uart)return -ENODEV ;/* Not configured */ } - uart->res_base =request_region (io_base,8 ,"Serial MIDI" ); -if (uart->res_base ==NULL ) { +if (!devm_request_region (uart->card->dev, io_base,8 ,"Serial MIDI" )) {snd_printk (KERN_ERR "u16550: can't grab port 0x%lx\n" , io_base);return -EBUSY ; }
@@ -752,21 +750,6 @@ static const struct snd_rawmidi_ops snd_uart16550_input = .trigger = snd_uart16550_input_trigger, }; -static int snd_uart16550_free (struct snd_uart16550 *uart) -{ -if (uart->irq >=0 ) -free_irq (uart->irq, uart); -release_and_free_resource (uart->res_base); -kfree (uart); -return 0 ; -}; - -static int snd_uart16550_dev_free (struct snd_device *device) -{ -struct snd_uart16550 *uart = device->device_data; -return snd_uart16550_free (uart); -} - static int snd_uart16550_create(struct snd_card *card, unsigned long iobase, int irq,
@@ -776,14 +759,11 @@ static int snd_uart16550_create(struct snd_card *card,int droponfull, struct snd_uart16550 **ruart) { -static const struct snd_device_ops ops = { - .dev_free = snd_uart16550_dev_free, - }; struct snd_uart16550 *uart;int err; - uart =kzalloc (sizeof (*uart),GFP_KERNEL ); + uart =devm_kzalloc (card->dev,sizeof (*uart),GFP_KERNEL );if (!uart)return -ENOMEM ; uart->adaptor = adaptor;
@@ -796,13 +776,12 @@ static int snd_uart16550_create(struct snd_card *card, err =snd_uart16550_detect (uart);if (err <=0 ) {printk (KERN_ERR "no UART detected at 0x%lx\n" , iobase); -snd_uart16550_free (uart);return -ENODEV ; }if (irq >=0 && irq !=SNDRV_AUTO_IRQ ) { -if (request_irq (irq, snd_uart16550_interrupt, -0 ,"Serial MIDI" , uart)) { +if (devm_request_irq (card->dev, irq, snd_uart16550_interrupt, +0 ,"Serial MIDI" , uart)) {snd_printk (KERN_WARNING "irq %d busy. Using Polling.\n" , irq); }else {
@@ -819,13 +798,6 @@ static int snd_uart16550_create(struct snd_card *card,timer_setup (&uart->buffer_timer, snd_uart16550_buffer_timer,0 ); uart->timer_running =0 ; -/* Register device */ - err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , uart, &ops); -if (err <0 ) { -snd_uart16550_free (uart); -return err; - } -switch (uart->adaptor) {case SNDRV_SERIAL_MS124W_SA :case SNDRV_SERIAL_MS124W_MB :
@@ -927,8 +899,8 @@ static int snd_serial_probe(struct platform_device *devptr)return -ENODEV ; } - err =snd_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , -0 , &card); + err =snd_devm_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , +0 , &card);if (err <0 )return err;
@@ -939,11 +911,11 @@ static int snd_serial_probe(struct platform_device *devptr) base[dev], adaptor[dev], droponfull[dev], &uart);if (err <0 ) - goto _err; +return err; err =snd_uart16550_rmidi (uart,0 , outs[dev], ins[dev], &uart->rmidi);if (err <0 ) - goto _err; +return err; sprintf(card->longname, "%s [%s] at %#lx, irq %d", card->shortname,
@@ -953,27 +925,16 @@ static int snd_serial_probe(struct platform_device *devptr) err =snd_card_register (card);if (err <0 ) - goto _err; +return err;platform_set_drvdata (devptr, card);return 0 ; - - _err: -snd_card_free (card); -return err; -} - -static int snd_serial_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); -return 0 ; }#define SND_SERIAL_DRIVER "snd_serial_u16550"static struct platform_driver snd_serial_driver = { .probe = snd_serial_probe, - .remove = snd_serial_remove, .driver = { .name =SND_SERIAL_DRIVER , },
Signature · 1 line
2.26.2
PATCH v2 76/79 ALSA: mpu401: Allocate resources with device-managed APIs
In reply to Takashi IwaiThis patch converts the card object management with devres as a clean up. The remove callback gets reduced by that.
This should give no user-visible functional changes.
Note that this converts only the mpu401 card driver. The mpu401_uart component is still managed with snd_device. It's for the case where the mpu401_uart component may be removed dynamically without the actual device unbind.
--- sound/drivers/mpu401/mpu401.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-)
sound/drivers/mpu401/mpu401.c +5 -29
@@ -59,8 +59,8 @@ static int snd_mpu401_create(struct device *devptr, int dev,snd_printk (KERN_ERR "the uart_enter option is obsolete; remove it\n" ); *rcard =NULL ; - err =snd_card_new (devptr, index[dev], id[dev],THIS_MODULE , -0 , &card); + err =snd_devm_card_new (devptr, index[dev], id[dev],THIS_MODULE , +0 , &card);if (err <0 )return err;strcpy (card->driver,"MPU-401 UART" );
@@ -76,15 +76,11 @@ static int snd_mpu401_create(struct device *devptr, int dev, irq[dev], NULL);if (err <0 ) {printk (KERN_ERR "MPU401 not detected at 0x%lx\n" , port[dev]); - goto _err; +return err; } *rcard = card;return 0 ; - - _err: -snd_card_free (card); -return err; }static int snd_mpu401_probe (struct platform_device *devptr)
@@ -105,25 +101,16 @@ static int snd_mpu401_probe(struct platform_device *devptr)if (err <0 )return err; err =snd_card_register (card); -if (err <0 ) { -snd_card_free (card); +if (err <0 )return err; - }platform_set_drvdata (devptr, card);return 0 ; } -static int snd_mpu401_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); -return 0 ; -} -#define SND_MPU401_DRIVER "snd_mpu401"static struct platform_driver snd_mpu401_driver = { .probe = snd_mpu401_probe, - .remove = snd_mpu401_remove, .driver = { .name =SND_MPU401_DRIVER , },
@@ -184,10 +171,8 @@ static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,if (err <0 )return err; err =snd_card_register (card); -if (err <0 ) { -snd_card_free (card); +if (err <0 )return err; - }pnp_set_drvdata (pnp_dev, card); snd_mpu401_devices++; ++dev;
@@ -196,19 +181,10 @@ static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev, return -ENODEV; } -static void snd_mpu401_pnp_remove (struct pnp_dev *dev) -{ -struct snd_card *card = (struct snd_card *)pnp_get_drvdata (dev); - -snd_card_disconnect (card); -snd_card_free_when_closed (card); -} -static struct pnp_driver snd_mpu401_pnp_driver = { .name ="mpu401" , .id_table = snd_mpu401_pnpids, .probe = snd_mpu401_pnp_probe, - .remove = snd_mpu401_pnp_remove, };#else static struct pnp_driver snd_mpu401_pnp_driver;
Signature · 1 line
2.26.2
PATCH v2 77/79 ALSA: aloop: Allocate resources with device-managed APIs
In reply to Takashi IwaiUse the new snd_devm_card_new() for the card object allocation, and clean up the superfluous remove callback.
--- sound/drivers/aloop.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
sound/drivers/aloop.c +8 -18
@@ -1712,8 +1712,8 @@ static int loopback_probe(struct platform_device *devptr)int dev = devptr->id;int err; - err =snd_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , -sizeof (struct loopback ), &card); + err =snd_devm_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , +sizeof (struct loopback ), &card);if (err <0 )return err; loopback = card->private_data;
@@ -1730,13 +1730,13 @@ static int loopback_probe(struct platform_device *devptr) err =loopback_pcm_new (loopback,0 , pcm_substreams[dev]);if (err <0 ) - goto __nodev; +return err; err =loopback_pcm_new (loopback,1 , pcm_substreams[dev]);if (err <0 ) - goto __nodev; +return err; err =loopback_mixer_new (loopback, pcm_notify[dev] ?1 :0 );if (err <0 ) - goto __nodev; +return err;loopback_cable_proc_new (loopback,0 );loopback_cable_proc_new (loopback,1 );loopback_timer_source_proc_new (loopback);
@@ -1744,18 +1744,9 @@ static int loopback_probe(struct platform_device *devptr)strcpy (card->shortname,"Loopback" );sprintf (card->longname,"Loopback %i" , dev +1 ); err =snd_card_register (card); -if (!err) { -platform_set_drvdata (devptr, card); -return 0 ; - } - __nodev: -snd_card_free (card); -return err; -} - -static int loopback_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); +if (err <0 ) +return err; +platform_set_drvdata (devptr, card);return 0 ; }
@@ -1786,7 +1777,6 @@ static SIMPLE_DEV_PM_OPS(loopback_pm, loopback_suspend, loopback_resume);static struct platform_driver loopback_driver = { .probe = loopback_probe, - .remove = loopback_remove, .driver = { .name =SND_LOOPBACK_DRIVER , .pm =LOOPBACK_PM_OPS ,
Signature · 1 line
2.26.2
PATCH v2 78/79 ALSA: dummy: Allocate resources with device-managed APIs
In reply to Takashi IwaiUse the new snd_devm_card_new() for the card object allocation, and clean up the superfluous remove callback.
--- sound/drivers/dummy.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
sound/drivers/dummy.c +7 -17
@@ -1025,8 +1025,8 @@ static int snd_dummy_probe(struct platform_device *devptr)int idx, err;int dev = devptr->id; - err =snd_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , -sizeof (struct snd_dummy ), &card); + err =snd_devm_card_new (&devptr->dev, index[dev], id[dev],THIS_MODULE , +sizeof (struct snd_dummy ), &card);if (err <0 )return err; dummy = card->private_data;
@@ -1047,7 +1047,7 @@ static int snd_dummy_probe(struct platform_device *devptr) pcm_substreams[dev] =MAX_PCM_SUBSTREAMS ; err =snd_card_dummy_pcm (dummy, idx, pcm_substreams[dev]);if (err <0 ) - goto __nodev; +return err; } dummy->pcm_hw = dummy_pcm_hardware;
@@ -1078,7 +1078,7 @@ static int snd_dummy_probe(struct platform_device *devptr) err =snd_card_dummy_new_mixer (dummy);if (err <0 ) - goto __nodev; +return err;strcpy (card->driver,"Dummy" );strcpy (card->shortname,"Dummy" );sprintf (card->longname,"Dummy %i" , dev +1 );
@@ -1086,18 +1086,9 @@ static int snd_dummy_probe(struct platform_device *devptr)dummy_proc_init (dummy); err =snd_card_register (card); -if (err ==0 ) { -platform_set_drvdata (devptr, card); -return 0 ; - } - __nodev: -snd_card_free (card); -return err; -} - -static int snd_dummy_remove (struct platform_device *devptr) -{ -snd_card_free (platform_get_drvdata (devptr)); +if (err <0 ) +return err; +platform_set_drvdata (devptr, card);return 0 ; }
@@ -1128,7 +1119,6 @@ static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);static struct platform_driver snd_dummy_driver = { .probe = snd_dummy_probe, - .remove = snd_dummy_remove, .driver = { .name =SND_DUMMY_DRIVER , .pm =SND_DUMMY_PM_OPS ,
Signature · 1 line
2.26.2
PATCH v2 79/79 ALSA: pcsp: Allocate resources with device-managed APIs
In reply to Takashi IwaiUse the new snd_devm_card_new() for the card object allocation and the devres version for the input device, and clean up the superfluous remove callback.
--- sound/drivers/pcsp/pcsp.c | 49 +++++++++++---------------------- sound/drivers/pcsp/pcsp_input.c | 14 ++-------- sound/drivers/pcsp/pcsp_input.h | 1 - 3 files changed, 18 insertions(+), 46 deletions(-)
sound/drivers/pcsp/pcsp.c +16 -33
@@ -42,9 +42,8 @@ struct snd_pcsp pcsp_chip;static int snd_pcsp_create (struct snd_card *card) { -static const struct snd_device_ops ops = { };unsigned int resolution = hrtimer_resolution; -int err, div, min_div, order; +int div, min_div, order;if (!nopcm) {if (resolution >PCSP_MAX_PERIOD_NS ) {
@@ -83,15 +82,18 @@ static int snd_pcsp_create(struct snd_card *card) pcsp_chip.port =0x61 ; pcsp_chip.irq =-1 ; pcsp_chip.dma =-1 ; - -/* Register device */ - err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , &pcsp_chip, &ops); -if (err <0 ) -return err; + card->private_data = &pcsp_chip;return 0 ; } +static void pcsp_stop_beep (struct snd_pcsp *chip); + +static void alsa_card_pcsp_free (struct snd_card *card) +{ +pcsp_stop_beep (card->private_data); +} +static int snd_card_pcsp_probe (int devnum,struct device *dev) {struct snd_card *card;
@@ -103,22 +105,22 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev)hrtimer_init (&pcsp_chip.timer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); pcsp_chip.timer.function = pcsp_do_timer; - err =snd_card_new (dev, index, id,THIS_MODULE ,0 , &card); + err =snd_devm_card_new (dev, index, id,THIS_MODULE ,0 , &card);if (err <0 )return err; err =snd_pcsp_create (card);if (err <0 ) - goto free_card; +return err;if (!nopcm) { err =snd_pcsp_new_pcm (&pcsp_chip);if (err <0 ) - goto free_card; +return err; } err =snd_pcsp_new_mixer (&pcsp_chip, nopcm);if (err <0 ) - goto free_card; +return err;strcpy (card->driver,"PC-Speaker" );strcpy (card->shortname,"pcsp" );
@@ -127,13 +129,10 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev) err =snd_card_register (card);if (err <0 ) - goto free_card; +return err; + card->private_free = alsa_card_pcsp_free;return 0 ; - -free_card: -snd_card_free (card); -return err; }static int alsa_card_pcsp_init (struct device *dev)
@@ -155,11 +154,6 @@ static int alsa_card_pcsp_init(struct device *dev)return 0 ; } -static void alsa_card_pcsp_exit (struct snd_pcsp *chip) -{ -snd_card_free (chip->card); -} -static int pcsp_probe (struct platform_device *dev) {int err;
@@ -169,23 +163,13 @@ static int pcsp_probe(struct platform_device *dev)return err; err =alsa_card_pcsp_init (&dev->dev); -if (err <0 ) { -pcspkr_input_remove (pcsp_chip.input_dev); +if (err <0 )return err; - }platform_set_drvdata (dev, &pcsp_chip);return 0 ; } -static int pcsp_remove (struct platform_device *dev) -{ -struct snd_pcsp *chip =platform_get_drvdata (dev); -pcspkr_input_remove (chip->input_dev); -alsa_card_pcsp_exit (chip); -return 0 ; -} -static void pcsp_stop_beep (struct snd_pcsp *chip) {pcsp_sync_stop (chip);
@@ -218,7 +202,6 @@ static struct platform_driver pcsp_platform_driver = { .pm = PCSP_PM_OPS, }, .probe = pcsp_probe, - .remove = pcsp_remove, .shutdown = pcsp_shutdown, };
sound/drivers/pcsp/pcsp_input.c +2 -12
@@ -78,7 +78,7 @@ int pcspkr_input_init(struct input_dev **rdev, struct device *dev) {int err; -struct input_dev *input_dev =input_allocate_device (); +struct input_dev *input_dev =devm_input_allocate_device (dev);if (!input_dev)return -ENOMEM ;
@@ -95,19 +95,9 @@ int pcspkr_input_init(struct input_dev **rdev, struct device *dev) input_dev->event = pcspkr_input_event; err =input_register_device (input_dev); -if (err) { -input_free_device (input_dev); +if (err)return err; - } *rdev = input_dev;return 0 ; } - -int pcspkr_input_remove (struct input_dev *dev) -{ -pcspkr_stop_sound (); -input_unregister_device (dev);/* this also does kfree() */ - -return 0 ; -}
sound/drivers/pcsp/pcsp_input.h +0 -1
@@ -9,7 +9,6 @@#define __PCSP_INPUT_H__int pcspkr_input_init (struct input_dev **rdev,struct device *dev); -int pcspkr_input_remove (struct input_dev *dev);void pcspkr_stop_sound (void );#endif
Signature · 1 line
2.26.2