diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2026-01-10 10:39:06 +0900 |
|---|---|---|
| committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2026-01-12 11:49:37 +0900 |
| commit | a69a9e630d49e2b990486360c371278d42993df0 (patch) | |
| tree | 60b81f43cc4f1ef89d452bd28283fa11407cde3d /drivers/firewire | |
| parent | adc839ae7d0f6c1a823e9731e45abfd87c6cf28b (diff) | |
firewire: core: code refactoring with cleanup function for isoc pages
This commit refactors the implementation to allocate pages for isochronous
DMA contexts with cleanup function.
Link: https://lore.kernel.org/r/20260110013911.19160-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/core-iso.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c index a67493862c85..e678ffba5de2 100644 --- a/drivers/firewire/core-iso.c +++ b/drivers/firewire/core-iso.c @@ -30,26 +30,29 @@ int fw_iso_buffer_alloc(struct fw_iso_buffer *buffer, int page_count) { + struct page **page_array __free(kfree) = kcalloc(page_count, sizeof(page_array[0]), GFP_KERNEL); int i; - buffer->page_count = 0; - buffer->page_count_mapped = 0; - buffer->pages = kmalloc_array(page_count, sizeof(buffer->pages[0]), - GFP_KERNEL); - if (buffer->pages == NULL) + if (!page_array) return -ENOMEM; - for (i = 0; i < page_count; i++) { - buffer->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO); - if (buffer->pages[i] == NULL) + for (i = 0; i < page_count; ++i) { + struct page *page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO); + + if (!page) break; + page_array[i] = page; } - buffer->page_count = i; + if (i < page_count) { - fw_iso_buffer_destroy(buffer, NULL); + while (i-- > 0) + __free_page(page_array[i]); return -ENOMEM; } + buffer->page_count = page_count; + buffer->pages = no_free_ptr(page_array); + return 0; } @@ -104,11 +107,14 @@ void fw_iso_buffer_destroy(struct fw_iso_buffer *buffer, dma_unmap_page(card->device, address, PAGE_SIZE, buffer->direction); } - for (i = 0; i < buffer->page_count; i++) - __free_page(buffer->pages[i]); - kfree(buffer->pages); - buffer->pages = NULL; + if (buffer->pages) { + for (int i = 0; i < buffer->page_count; ++i) + __free_page(buffer->pages[i]); + kfree(buffer->pages); + buffer->pages = NULL; + } + buffer->page_count = 0; buffer->page_count_mapped = 0; } |