From 2e025c71ce3dbfb5ddb7f2e4bb67ac11b65f8dd2 Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy Date: Sat, 20 Aug 2011 14:15:55 -0700 Subject: [PATCH] dm9000: define debug level as a module parameter 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 Signed-off-by: David S. Miller --- drivers/net/ethernet/davicom/Kconfig | 8 -------- drivers/net/ethernet/davicom/dm9000.c | 11 ++++++++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig index 1809d25d6eda..73c5d2080f24 100644 --- a/drivers/net/ethernet/davicom/Kconfig +++ b/drivers/net/ethernet/davicom/Kconfig @@ -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 diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c index 24d61e14f9cd..438f4580bf66 100644 --- a/drivers/net/ethernet/davicom/dm9000.c +++ b/drivers/net/ethernet/davicom/dm9000.c @@ -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 @@ -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; @@ -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) -- 2.20.1