| From dhobsong@igel.co.jp Mon Oct 29 00:52:39 2012 |
| From: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Date: Mon, 29 Oct 2012 16:50:38 +0900 |
| Subject: [PATCH v2 21/58] ARM: dma-mapping: introduce DMA_ERROR_CODE constant |
| To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au |
| Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp |
| Message-ID: <1351497075-32717-22-git-send-email-dhobsong@igel.co.jp> |
| |
| |
| From: Marek Szyprowski <m.szyprowski@samsung.com> |
| |
| Replace all uses of ~0 with DMA_ERROR_CODE, what should make the code |
| easier to read. |
| |
| Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| Acked-by: Kyungmin Park <kyungmin.park@samsung.com> |
| Tested-By: Subash Patel <subash.ramaswamy@linaro.org> |
| (cherry picked from commit 553ac78877242b6d8b591323731df304140d0f99) |
| |
| Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| --- |
| arch/arm/common/dmabounce.c | 6 +++--- |
| arch/arm/include/asm/dma-mapping.h | 4 +++- |
| arch/arm/mm/dma-mapping.c | 2 +- |
| 3 files changed, 7 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c |
| index 595ecd29..210ad1b 100644 |
| --- a/arch/arm/common/dmabounce.c |
| +++ b/arch/arm/common/dmabounce.c |
| @@ -254,7 +254,7 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size, |
| if (buf == NULL) { |
| dev_err(dev, "%s: unable to map unsafe buffer %p!\n", |
| __func__, ptr); |
| - return ~0; |
| + return DMA_ERROR_CODE; |
| } |
| |
| dev_dbg(dev, "%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n", |
| @@ -320,7 +320,7 @@ dma_addr_t __dma_map_page(struct device *dev, struct page *page, |
| |
| ret = needs_bounce(dev, dma_addr, size); |
| if (ret < 0) |
| - return ~0; |
| + return DMA_ERROR_CODE; |
| |
| if (ret == 0) { |
| __dma_page_cpu_to_dev(page, offset, size, dir); |
| @@ -329,7 +329,7 @@ dma_addr_t __dma_map_page(struct device *dev, struct page *page, |
| |
| if (PageHighMem(page)) { |
| dev_err(dev, "DMA buffer bouncing of HIGHMEM pages is not supported\n"); |
| - return ~0; |
| + return DMA_ERROR_CODE; |
| } |
| |
| return map_single(dev, page_address(page) + offset, size, dir); |
| diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h |
| index cb3b7c9..6a838da 100644 |
| --- a/arch/arm/include/asm/dma-mapping.h |
| +++ b/arch/arm/include/asm/dma-mapping.h |
| @@ -10,6 +10,8 @@ |
| #include <asm-generic/dma-coherent.h> |
| #include <asm/memory.h> |
| |
| +#define DMA_ERROR_CODE (~0) |
| + |
| #ifdef __arch_page_to_dma |
| #error Please update to __arch_pfn_to_dma |
| #endif |
| @@ -123,7 +125,7 @@ extern int dma_set_mask(struct device *, u64); |
| */ |
| static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
| { |
| - return dma_addr == ~0; |
| + return dma_addr == DMA_ERROR_CODE; |
| } |
| |
| /* |
| diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c |
| index bb19804..fab24ec 100644 |
| --- a/arch/arm/mm/dma-mapping.c |
| +++ b/arch/arm/mm/dma-mapping.c |
| @@ -584,7 +584,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, |
| */ |
| gfp &= ~(__GFP_COMP); |
| |
| - *handle = ~0; |
| + *handle = DMA_ERROR_CODE; |
| size = PAGE_ALIGN(size); |
| |
| if (arch_is_coherent() || nommu()) |
| -- |
| 1.7.5.4 |
| |