From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 7 Oct 2010 12:31:33 +0000 (-0300)
Subject: [media] videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)
X-Git-Tag: MMI-PSA29.97-13-9~21911^2~307
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bede7521dbc12b386f72f26d41933789ccc9d7d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[media] videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

As pointed by Laurent:

I think min_t(size_t, PAGE_SIZE, size) is the preferred way.

Thanks-to: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 7153e44efd52..20f227ee2b3e 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -116,8 +116,8 @@ static struct scatterlist *videobuf_pages_to_sg(struct page **pages,
 			goto nopage;
 		if (PageHighMem(pages[i]))
 			goto highmem;
-		sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
-		size -= min((unsigned)PAGE_SIZE, size);
+		sg_set_page(&sglist[i], pages[i], min_t(size_t, PAGE_SIZE, size), 0);
+		size -= min_t(size_t, PAGE_SIZE, size);
 	}
 	return sglist;