diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-10-10 05:56:31 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:18:00 -0500 |
commit | b1d5776d865951c213a1caaab5d8bf5de7615dbd (patch) | |
tree | f999dca30f6e2d03a9176b86c613ae8f4531a6d6 /sound/isa/es18xx.c | |
parent | 93f2e37840a9a7c3693ca6961fe6ad46b250f3b9 (diff) |
[ALSA] Remove vmalloc wrapper, kfree_nocheck()
- Remove vmalloc wrapper
- Add release_and_free_resource() to remove kfree_nocheck() from each driver
and simplify the code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/es18xx.c')
-rw-r--r-- | sound/isa/es18xx.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index d0ea19f42703..f0f8505cd1a5 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c | |||
@@ -1640,18 +1640,9 @@ static int snd_es18xx_resume(snd_card_t *card) | |||
1640 | 1640 | ||
1641 | static int snd_es18xx_free(es18xx_t *chip) | 1641 | static int snd_es18xx_free(es18xx_t *chip) |
1642 | { | 1642 | { |
1643 | if (chip->res_port) { | 1643 | release_and_free_resource(chip->res_port); |
1644 | release_resource(chip->res_port); | 1644 | release_and_free_resource(chip->res_ctrl_port); |
1645 | kfree_nocheck(chip->res_port); | 1645 | release_and_free_resource(chip->res_mpu_port); |
1646 | } | ||
1647 | if (chip->res_ctrl_port) { | ||
1648 | release_resource(chip->res_ctrl_port); | ||
1649 | kfree_nocheck(chip->res_ctrl_port); | ||
1650 | } | ||
1651 | if (chip->res_mpu_port) { | ||
1652 | release_resource(chip->res_mpu_port); | ||
1653 | kfree_nocheck(chip->res_mpu_port); | ||
1654 | } | ||
1655 | if (chip->irq >= 0) | 1646 | if (chip->irq >= 0) |
1656 | free_irq(chip->irq, (void *) chip); | 1647 | free_irq(chip->irq, (void *) chip); |
1657 | if (chip->dma1 >= 0) { | 1648 | if (chip->dma1 >= 0) { |