diff options
| author | Greg Kroah-Hartman | 2009-07-15 20:05:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-09-15 21:01:47 +0200 |
| commit | fc6a4b2609b35448ad72302d375a40edf31887d2 (patch) | |
| tree | f25e6e6a8c142f5a9e56170b6855724e246966e9 /drivers/staging/hv/storvsc_drv.c | |
| parent | Staging: hv: remove #defines from osd.c (diff) | |
| download | kernel-qcow2-linux-fc6a4b2609b35448ad72302d375a40edf31887d2.tar.gz kernel-qcow2-linux-fc6a4b2609b35448ad72302d375a40edf31887d2.tar.xz kernel-qcow2-linux-fc6a4b2609b35448ad72302d375a40edf31887d2.zip | |
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>
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 1a05134cc40e..3547c03e0143 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; |