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/debug.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/debug.c')
-rw-r--r-- | drivers/isdn/hardware/eicon/debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c index 6851c6270ce8..d835e74ecf18 100644 --- a/drivers/isdn/hardware/eicon/debug.c +++ b/drivers/isdn/hardware/eicon/debug.c | |||
@@ -756,14 +756,14 @@ int diva_get_driver_info (dword id, byte* data, int data_length) { | |||
756 | 756 | ||
757 | data_length -= 9; | 757 | data_length -= 9; |
758 | 758 | ||
759 | if ((to_copy = MIN(strlen(clients[id].drvName), data_length-1))) { | 759 | if ((to_copy = min(strlen(clients[id].drvName), (size_t)(data_length-1)))) { |
760 | memcpy (p, clients[id].drvName, to_copy); | 760 | memcpy (p, clients[id].drvName, to_copy); |
761 | p += to_copy; | 761 | p += to_copy; |
762 | data_length -= to_copy; | 762 | data_length -= to_copy; |
763 | if ((data_length >= 4) && clients[id].hDbg->drvTag[0]) { | 763 | if ((data_length >= 4) && clients[id].hDbg->drvTag[0]) { |
764 | *p++ = '('; | 764 | *p++ = '('; |
765 | data_length -= 1; | 765 | data_length -= 1; |
766 | if ((to_copy = MIN(strlen(clients[id].hDbg->drvTag), data_length-2))) { | 766 | if ((to_copy = min(strlen(clients[id].hDbg->drvTag), (size_t)(data_length-2)))) { |
767 | memcpy (p, clients[id].hDbg->drvTag, to_copy); | 767 | memcpy (p, clients[id].hDbg->drvTag, to_copy); |
768 | p += to_copy; | 768 | p += to_copy; |
769 | data_length -= to_copy; | 769 | data_length -= to_copy; |