Skip to content

Commit

Permalink
dm9000: define debug level as a module parameter
Browse files Browse the repository at this point in the history
This change allows to get driver specific debug messages output
providing a module parameter. As far as the maximum level of verbosity
is too high, it is demoted by default.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vladimir Zapolskiy authored and David S. Miller committed Aug 20, 2011
1 parent 823dcd2 commit 2e025c7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
8 changes: 0 additions & 8 deletions drivers/net/ethernet/davicom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ config DM9000
To compile this driver as a module, choose M here. The module
will be called dm9000.

config DM9000_DEBUGLEVEL
int "DM9000 maximum debug level"
depends on DM9000
default 4
---help---
The maximum level of debugging code compiled into the DM9000
driver.

config DM9000_FORCE_SIMPLE_PHY_POLL
bool "Force simple NSR based PHY polling"
depends on DM9000
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/ethernet/davicom/dm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ static int watchdog = 5000;
module_param(watchdog, int, 0400);
MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");

/*
* Debug messages level
*/
static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "dm9000 debug level (0-4)");

/* DM9000 register address locking.
*
* The DM9000 uses an address register to control where data written
Expand Down Expand Up @@ -103,7 +110,6 @@ typedef struct board_info {
unsigned int flags;
unsigned int in_suspend :1;
unsigned int wake_supported :1;
int debug_level;

enum dm9000_type type;

Expand Down Expand Up @@ -138,8 +144,7 @@ typedef struct board_info {
/* debug code */

#define dm9000_dbg(db, lev, msg...) do { \
if ((lev) < CONFIG_DM9000_DEBUGLEVEL && \
(lev) < db->debug_level) { \
if ((lev) < debug) { \
dev_dbg(db->dev, msg); \
} \
} while (0)
Expand Down

0 comments on commit 2e025c7

Please sign in to comment.