Staging: hv: remove MIN and MAX usages

The kernel has the "correct" min() and max() functions, so use those.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 1a9e4dee784de8998caa71bbfb1fa605ab1ca49c..dfc20c3d3f9b71010b0aff9f1488c677a9ab13b1 100644 (file)
--- 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 1a05134cc40ea028b403cfd2b4e0f86e44dfe441..3547c03e0143c1d41a3da4fd261378ac5fd583e1 100644 (file)
--- 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;