diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-15 09:59:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-19 16:17:09 +0200 |
| commit | a033954140ac43a8ce0eab469229a107cfee1c87 (patch) | |
| tree | 4b0ef5dc6df1e595a33e49d2c6719d3238323ddd /sound/pcmcia | |
| parent | ALSA: trident: Allocate resources with device-managed APIs (diff) | |
| download | linux-a033954140ac43a8ce0eab469229a107cfee1c87.tar.xz linux-a033954140ac43a8ce0eab469229a107cfee1c87.zip | |
ALSA: vx: Manage vx_core object with devres
The firmware data are also released automatically.
Link: https://lore.kernel.org/r/20210715075941.23332-50-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia')
| -rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 0dfb6a943b60..7a0f0e73ceb2 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -51,19 +51,6 @@ static void vxpocket_release(struct pcmcia_device *link) } /* - * destructor, called from snd_card_free_when_closed() - */ -static int snd_vxpocket_dev_free(struct snd_device *device) -{ - struct vx_core *chip = device->device_data; - - snd_vx_free_firmware(chip); - kfree(chip); - return 0; -} - - -/* * Hardware information */ @@ -122,21 +109,12 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl, { struct vx_core *chip; struct snd_vxpocket *vxp; - static const struct snd_device_ops ops = { - .dev_free = snd_vxpocket_dev_free, - }; - int err; chip = snd_vx_create(card, &vxpocket_hw, &snd_vxpocket_ops, sizeof(struct snd_vxpocket) - sizeof(struct vx_core)); if (!chip) return -ENOMEM; - err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); - if (err < 0) { - kfree(chip); - return err; - } chip->ibl.size = ibl; vxp = to_vxpocket(chip); |