diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-11-23 19:38:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-03-27 17:15:01 +0100 |
| commit | 734b5a0bbdf43518e6739c8156a985e385e557fe (patch) | |
| tree | cfadbf71e5579f10a6ae526f31923348a9007ae0 /sound/usb/usx2y/usbusx2y.c | |
| parent | e42dd3ee3f9c6007c569386a8477a19d3e7503f9 (diff) | |
| download | linux-734b5a0bbdf43518e6739c8156a985e385e557fe.tar.gz linux-734b5a0bbdf43518e6739c8156a985e385e557fe.tar.bz2 linux-734b5a0bbdf43518e6739c8156a985e385e557fe.zip | |
ALSA: Replace snd_malloc_pages() and snd_free_pages() with standard helpers, take#2
snd_malloc_pages() and snd_free_pages() are merely thin wrappers of
the standard page allocator / free functions. Even the arguments are
compatible with some standard helpers, so there is little merit of
keeping these wrappers.
This patch replaces the all existing callers of snd_malloc_pages() and
snd_free_pages() with the direct calls of the standard helper
functions. In this version, we use a recently introduced one,
alloc_pages_exact(), which suits better than the old
snd_malloc_pages() implementation for our purposes. Then we can avoid
the waste of pages by alignment to power-of-two.
Since alloc_pages_exact() does split pages, we need no longer
__GFP_COMP flag; or better to say, we must not pass __GFP_COMP to
alloc_pages_exact(). So the former unconditional addition of
__GFP_COMP flag in snd_malloc_pages() is dropped, as well as in most
other places.
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.c')
| -rw-r--r-- | sound/usb/usx2y/usbusx2y.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c index da4a5a541512..9f7bbed2c0f0 100644 --- a/sound/usb/usx2y/usbusx2y.c +++ b/sound/usb/usx2y/usbusx2y.c @@ -437,7 +437,8 @@ static void snd_usX2Y_card_private_free(struct snd_card *card) kfree(usX2Y(card)->In04Buf); usb_free_urb(usX2Y(card)->In04urb); if (usX2Y(card)->us428ctls_sharedmem) - snd_free_pages(usX2Y(card)->us428ctls_sharedmem, sizeof(*usX2Y(card)->us428ctls_sharedmem)); + free_pages_exact(usX2Y(card)->us428ctls_sharedmem, + sizeof(*usX2Y(card)->us428ctls_sharedmem)); if (usX2Y(card)->card_index >= 0 && usX2Y(card)->card_index < SNDRV_CARDS) snd_usX2Y_card_used[usX2Y(card)->card_index] = 0; } |