[media] videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 7 Oct 2010 12:31:33 +0000 (09:31 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:17:00 +0000 (01:17 -0200)
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>
drivers/media/video/videobuf-dma-sg.c

index 7153e44efd52e3d37880a5b09c51bceac5c9af48..20f227ee2b3e63cf58d10ef621665a4df18764fd 100644 (file)
@@ -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;