From: Santosh Shilimkar Date: Mon, 29 Jul 2013 13:17:54 +0000 (+0100) Subject: ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit() X-Git-Tag: firefly_0821_release~176^2~4991^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f7e45d83ef09a481cbc4172849bd1fcf88a39ed;p=firefly-linux-kernel-4.4.55.git ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit() The blk_queue_bounce_limit() API parameter 'dma_mask' is actually the maximum address the device can handle rather than a dma_mask. Rename it accordingly to avoid it being interpreted as dma_mask. No functional change. The idea is to fix the bad assumptions about dma_mask wherever it could be miss-interpreted. Cc: Jens Axboe Signed-off-by: Santosh Shilimkar Signed-off-by: Russell King --- diff --git a/block/blk-settings.c b/block/blk-settings.c index c50ecf0ea3b1..026c1517505f 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -195,17 +195,17 @@ EXPORT_SYMBOL(blk_queue_make_request); /** * blk_queue_bounce_limit - set bounce buffer limit for queue * @q: the request queue for the device - * @dma_mask: the maximum address the device can handle + * @max_addr: the maximum address the device can handle * * Description: * Different hardware can have different requirements as to what pages * it can do I/O directly to. A low level driver can call * blk_queue_bounce_limit to have lower memory pages allocated as bounce - * buffers for doing I/O to pages residing above @dma_mask. + * buffers for doing I/O to pages residing above @max_addr. **/ -void blk_queue_bounce_limit(struct request_queue *q, u64 dma_mask) +void blk_queue_bounce_limit(struct request_queue *q, u64 max_addr) { - unsigned long b_pfn = dma_mask >> PAGE_SHIFT; + unsigned long b_pfn = max_addr >> PAGE_SHIFT; int dma = 0; q->bounce_gfp = GFP_NOIO;