From: Greg Kroah-Hartman <gregkh@xxxxxxx> The kernel has the "correct" min() and max() functions, so use those. Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx> Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> --- drivers/staging/hv/include/osd.h | 3 --- drivers/staging/hv/storvsc_drv.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) --- 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)) --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -623,7 +623,7 @@ static unsigned int copy_to_bounce_buffe 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_buf 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; _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization
