[PATCH 1/3] V4L/DVB: videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

[PATCH 1/3] V4L/DVB: videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

[Mauro Carvalho Chehab]

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 7153e44..20f227e 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;
 
-- 
1.7.1

Re: [PATCH 1/3] V4L/DVB: videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

[Laurent Pinchart]

Hi Mauro,

On Thursday 07 October 2010 14:45:43 Mauro Carvalho Chehab wrote:
> 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 7153e44..20f227e 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);

This won't pass checkpatch.pl (line > 80 characters long).

Beside, this patch applies on top of the previous one whereas I suppose you'd 
want to replace the previous one.

> +		size -= min_t(size_t, PAGE_SIZE, size);
>  	}
>  	return sglist;

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/3] V4L/DVB: videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

[Mauro Carvalho Chehab]

Em 07-10-2010 10:46, Laurent Pinchart escreveu:
> Hi Mauro,
> 
> On Thursday 07 October 2010 14:45:43 Mauro Carvalho Chehab wrote:
>> 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 7153e44..20f227e 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);
> 
> This won't pass checkpatch.pl (line > 80 characters long).

Yes, but the 80 char-long is not a hard limit. In this case, it seemed better to just
have a longer line.

> Beside, this patch applies on top of the previous one whereas I suppose you'd 
> want to replace the previous one.

I'll eventually merge the two patches when sending upstream.

>> +		size -= min_t(size_t, PAGE_SIZE, size);
>>  	}
>>  	return sglist;
> 

Cheers,
Mauro.