diff options
author | Amol Lad <amol@verismonetworks.com> | 2006-12-08 05:39:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:01 -0500 |
commit | e2de257cf15d0508d29fa8a54a0dad78de4e75eb (patch) | |
tree | dd6b100d37707f0384cdad5177e114036d54ce47 /drivers/isdn/hardware/eicon/istream.c | |
parent | 90cc301859ea8840634324a7f5b9680312377667 (diff) |
[PATCH] drivers/isdn: Handcrafted MIN/MAX Macro removal
Cleanups done to use min/max macros from kernel.h. Handcrafted MIN/MAX
macros are changed to use macros in kernel.h
[akpm@osdl.org: warning fix]
Signed-off-by: Amol Lad <amol@verismonetworks.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hardware/eicon/istream.c')
-rw-r--r-- | drivers/isdn/hardware/eicon/istream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/eicon/istream.c b/drivers/isdn/hardware/eicon/istream.c index 23139668d9b1..18f8798442fa 100644 --- a/drivers/isdn/hardware/eicon/istream.c +++ b/drivers/isdn/hardware/eicon/istream.c | |||
@@ -92,7 +92,7 @@ int diva_istream_write (void* context, | |||
92 | return (-1); /* was not able to write */ | 92 | return (-1); /* was not able to write */ |
93 | break; /* only part of message was written */ | 93 | break; /* only part of message was written */ |
94 | } | 94 | } |
95 | to_write = MIN(length, DIVA_DFIFO_DATA_SZ); | 95 | to_write = min(length, DIVA_DFIFO_DATA_SZ); |
96 | if (to_write) { | 96 | if (to_write) { |
97 | a->ram_out_buffer (a, | 97 | a->ram_out_buffer (a, |
98 | #ifdef PLATFORM_GT_32BIT | 98 | #ifdef PLATFORM_GT_32BIT |
@@ -176,7 +176,7 @@ int diva_istream_read (void* context, | |||
176 | return (-1); /* was not able to read */ | 176 | return (-1); /* was not able to read */ |
177 | break; | 177 | break; |
178 | } | 178 | } |
179 | to_read = MIN(max_length, tmp[1]); | 179 | to_read = min(max_length, (int)tmp[1]); |
180 | if (to_read) { | 180 | if (to_read) { |
181 | a->ram_in_buffer(a, | 181 | a->ram_in_buffer(a, |
182 | #ifdef PLATFORM_GT_32BIT | 182 | #ifdef PLATFORM_GT_32BIT |