History

dma-direct: consolidate the error handling in dma_direct_alloc_pages

Use a goto label to merge two error return cases.

Christoph Hellwig committed 6 years ago

Commit 3d0fc341 parent 4f8232b1 file · +6 −7Browse files

Unified · Split

kernel/dma/direct.c+6−7
@@ -169,11 +169,8 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, · 168 unmodified lines
169 ret = dma_common_contiguous_remap(page, PAGE_ALIGN(size),169 ret = dma_common_contiguous_remap(page, PAGE_ALIGN(size),
170 dma_pgprot(dev, PAGE_KERNEL, attrs),170 dma_pgprot(dev, PAGE_KERNEL, attrs),
171 __builtin_return_address(0));171 __builtin_return_address(0));
172 if (!ret) {172 if (!ret)
173 dma_free_contiguous(dev, page, size);173 goto out_free_pages;
174 return ret;
175 }
176
177 memset(ret, 0, size);174 memset(ret, 0, size);
178 goto done;175 goto done;
179 }176 }
@@ -186,8 +183,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, · 6 unmodified lines
186 * so log an error and fail.183 * so log an error and fail.
187 */184 */
188 dev_info(dev, "Rejecting highmem page from CMA.\n");185 dev_info(dev, "Rejecting highmem page from CMA.\n");
189 dma_free_contiguous(dev, page, size);186 goto out_free_pages;
190 return NULL;
191 }187 }
192 188
193 ret = page_address(page);189 ret = page_address(page);
@@ -207,6 +203,9 @@ done: · 13 unmodified lines
207 else203 else
208 *dma_handle = phys_to_dma(dev, page_to_phys(page));204 *dma_handle = phys_to_dma(dev, page_to_phys(page));
209 return ret;205 return ret;
206out_free_pages:
207 dma_free_contiguous(dev, page, size);
208 return NULL;
210}209}
211 210
212void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,211void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t