From: Greg Kroah-Hartman Date: Wed, 15 Jul 2009 18:05:14 +0000 (-0700) Subject: Staging: hv: remove MIN and MAX usages X-Git-Tag: v3.12-rc1~13346^2~462 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc6a4b2609b35448ad72302d375a40edf31887d2;p=kernel%2Fkernel-generic.git Staging: hv: remove MIN and MAX usages The kernel has the "correct" min() and max() functions, so use those. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 1a9e4de..dfc20c3 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -67,9 +67,6 @@ #define ALIGN_DOWN(value, align) ( (value) & ~(align-1) ) #define NUM_PAGES_SPANNED(addr, len) ( (ALIGN_UP(addr+len, PAGE_SIZE) - ALIGN_DOWN(addr, PAGE_SIZE)) >> PAGE_SHIFT ) -#define MIN(a, b) ((a) < (b)? (a): (b)) -#define MAX(a, b) ((a) > (b)? (a): (b)) - #define LOWORD(dw) ((unsigned short) (dw)) #define HIWORD(dw) ((unsigned short) (((unsigned int) (dw) >> 16) & 0xFFFF)) diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 1a05134..3547c03 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -623,7 +623,7 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, struct s dest = bounce_addr + bounce_sgl[j].length; destlen = PAGE_SIZE - bounce_sgl[j].length; - copylen = MIN(srclen, destlen); + copylen = min(srclen, destlen); memcpy((void*)dest, (void*)src, copylen); total_copied += copylen; @@ -698,7 +698,7 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl, struct src = bounce_addr + bounce_sgl[j].offset; srclen = bounce_sgl[j].length - bounce_sgl[j].offset; - copylen = MIN(srclen, destlen); + copylen = min(srclen, destlen); memcpy((void*)dest, (void*)src, copylen); total_copied += copylen;