[PATCH 38/41] staging: unisys: remove redundant max macro

Benjamin Romer benjamin.romer at unisys.com
Fri Oct 3 18:09:20 UTC 2014


No need to have another max macro when the kernel has one already.

Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
---
 drivers/staging/unisys/include/timskmod.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 98e8b20..de11f44 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -146,10 +146,6 @@
 		schedule_timeout(x);				    \
 	} while (0)
 
-#ifndef max
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
 static inline struct cdev *cdev_alloc_init(struct module *owner,
 					   const struct file_operations *fops)
 {
-- 
1.9.1



More information about the devel mailing list