Skip to contentSkip to conversation

V4L/DVB: videobuf-dma-sg: Fix a warning due to the usage of min(PAGE_SIZE, arg)

PATCH In review Mauro Carvalho Chehab 2 participants 2 messages Oct 7, 2010 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

PATCH 1/3 V4L/DVB: videobuf-dma-sg: Fix a warning due to the usage of min(PAGE_SIZE, arg)

drivers/media/video/videobuf-dma-sg.c: In function ‘videobuf_pages_to_sg’:
drivers/media/video/videobuf-dma-sg.c:119: warning: comparison of distinct pointer types lacks a cast drivers/media/video/videobuf-dma-sg.c:120: warning: comparison of distinct pointer types lacks a cast

Signed-off-by Mauro Carvalho Chehab <[email protected]>
drivers/media/video/videobuf-dma-sg.c +2 -2
index 359f2f3..7153e44 100644
@@ -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(PAGE_SIZE, size), 0);
-		size -= min(PAGE_SIZE, size);
+		sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
+		size -= min((unsigned)PAGE_SIZE, size);
 	}
 	return sglist;
Signature · 1 line
1.7.1
#1 lore raw

Hi Mauro,

Quoted 12 lines · On Thursday 07 October 2010 03:56:47 Mauro Carvalho Chehab wrote:

drivers/media/video/videobuf-dma-sg.c: In function ‘videobuf_pages_to_sg’:
drivers/media/video/videobuf-dma-sg.c:119: warning: comparison of distinct pointer types lacks a cast drivers/media/video/videobuf-dma-sg.c:120:
warning: comparison of distinct pointer types lacks a cast

Signed-off-by Mauro Carvalho Chehab <[email protected]>
(quoted diff) +0 -0

b/drivers/media/video/videobuf-dma-sg.c index 359f2f3..7153e44 100644

drivers/media/video/videobuf-dma-sg.c static struct scatterlist *videobuf_pages_to_sg(struct · line 120

Quoted 7 lines
drivers/media/video/videobuf-dma-sg.c +2 -2
@@ -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(PAGE_SIZE, size), 0);
-		size -= min(PAGE_SIZE, size);
+		sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
+		size -= min((unsigned)PAGE_SIZE, size);

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

Quoted 2 lines
drivers/media/video/videobuf-dma-sg.c +0 -0
 	}
 	return sglist;
Signature · 3 lines
Regards,

Laurent Pinchart