[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20060831122746.GZ3923@elf.ucw.cz>
Date: Thu, 31 Aug 2006 14:27:46 +0200
From: Pavel Machek <pavel@...e.cz>
To: Andrew Morton <akpm@...l.org>,
kernel list <linux-kernel@...r.kernel.org>,
john.ronciak@...el.com, jesse.brandeburg@...el.com,
jeffrey.t.kirsher@...el.com, auke-jan.h.kok@...el.com
Subject: e1000: small cleanups
Kill unneccessary macros and fix whitespace... e1000_osdep should just
die, but it is a bit soon for that :-(.
Signed-off-by: Pavel Machek <pavel@...e.cz>
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 2d3e8b0..503870c 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -43,7 +43,7 @@
#include <linux/sched.h>
#ifndef msec_delay
-#define msec_delay(x) do { if(in_interrupt()) { \
+#define msec_delay(x) do { if (in_interrupt()) { \
/* Don't mdelay in interrupt context! */ \
BUG(); \
} else { \
@@ -68,8 +68,6 @@ typedef enum {
TRUE = 1
} boolean_t;
-#define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
-
#ifdef DBG
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
@@ -79,9 +77,7 @@ typedef enum {
#endif
#define DEBUGFUNC(F) DEBUGOUT(F)
-#define DEBUGOUT2 DEBUGOUT1
-#define DEBUGOUT3 DEBUGOUT2
-#define DEBUGOUT7 DEBUGOUT3
+#define DEBUGOUT7 DEBUGOUT1
#define E1000_WRITE_REG(a, reg, value) ( \
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists