diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-05-15 06:22:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-18 00:03:45 -0400 |
commit | 64303258961c74f0168e056da14b612ce839dbc1 (patch) | |
tree | 7910435de1ed2f2623b57a68b3341d3e4999dfa7 /drivers/net/de600.c | |
parent | 62abb45f50dbd53a117aff72ff4e606592edb029 (diff) |
de600: convert PRINTK() to pr_debug()
Also remove de600_debug as it is not needed.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/de600.c')
-rw-r--r-- | drivers/net/de600.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index de63f1d41d32..c866ca99a068 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c | |||
@@ -38,14 +38,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj | |||
38 | /* Add more time here if your adapter won't work OK: */ | 38 | /* Add more time here if your adapter won't work OK: */ |
39 | #define DE600_SLOW_DOWN udelay(delay_time) | 39 | #define DE600_SLOW_DOWN udelay(delay_time) |
40 | 40 | ||
41 | /* use 0 for production, 1 for verification, >2 for debug */ | ||
42 | #ifdef DE600_DEBUG | ||
43 | #define PRINTK(x) if (de600_debug >= 2) printk x | ||
44 | #else | ||
45 | #define DE600_DEBUG 0 | ||
46 | #define PRINTK(x) /**/ | ||
47 | #endif | ||
48 | |||
49 | #include <linux/module.h> | 41 | #include <linux/module.h> |
50 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
51 | #include <linux/types.h> | 43 | #include <linux/types.h> |
@@ -67,10 +59,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj | |||
67 | 59 | ||
68 | #include "de600.h" | 60 | #include "de600.h" |
69 | 61 | ||
70 | static unsigned int de600_debug = DE600_DEBUG; | ||
71 | module_param(de600_debug, int, 0); | ||
72 | MODULE_PARM_DESC(de600_debug, "DE-600 debug level (0-2)"); | ||
73 | |||
74 | static unsigned int check_lost = 1; | 62 | static unsigned int check_lost = 1; |
75 | module_param(check_lost, bool, 0); | 63 | module_param(check_lost, bool, 0); |
76 | MODULE_PARM_DESC(check_lost, "If set then check for unplugged de600"); | 64 | MODULE_PARM_DESC(check_lost, "If set then check for unplugged de600"); |
@@ -193,7 +181,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
193 | } | 181 | } |
194 | 182 | ||
195 | /* Start real output */ | 183 | /* Start real output */ |
196 | PRINTK(("de600_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages)); | 184 | pr_debug("de600_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages); |
197 | 185 | ||
198 | if ((len = skb->len) < RUNT) | 186 | if ((len = skb->len) < RUNT) |
199 | len = RUNT; | 187 | len = RUNT; |
@@ -259,7 +247,7 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id) | |||
259 | irq_status = de600_read_status(dev); | 247 | irq_status = de600_read_status(dev); |
260 | 248 | ||
261 | do { | 249 | do { |
262 | PRINTK(("de600_interrupt (%02X)\n", irq_status)); | 250 | pr_debug("de600_interrupt (%02X)\n", irq_status); |
263 | 251 | ||
264 | if (irq_status & RX_GOOD) | 252 | if (irq_status & RX_GOOD) |
265 | de600_rx_intr(dev); | 253 | de600_rx_intr(dev); |
@@ -407,8 +395,7 @@ static struct net_device * __init de600_probe(void) | |||
407 | 395 | ||
408 | printk(KERN_INFO "%s: D-Link DE-600 pocket adapter", dev->name); | 396 | printk(KERN_INFO "%s: D-Link DE-600 pocket adapter", dev->name); |
409 | /* Alpha testers must have the version number to report bugs. */ | 397 | /* Alpha testers must have the version number to report bugs. */ |
410 | if (de600_debug > 1) | 398 | pr_debug("%s", version); |
411 | printk(version); | ||
412 | 399 | ||
413 | /* probe for adapter */ | 400 | /* probe for adapter */ |
414 | err = -ENODEV; | 401 | err = -ENODEV; |