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