The patch titled Char: mxser_new, debug printk dependent on DEBUG has been added to the -mm tree. Its filename is char-mxser_new-debug-printk-dependent-on-debug.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Char: mxser_new, debug printk dependent on DEBUG From: Jiri Slaby <jirislaby@xxxxxxxxx> Print some debug info only when DEBUG is enabled (use pr_debug macro). Eliminate verbose kernel parameter which takes care of this. Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/char/mxser_new.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff -puN drivers/char/mxser_new.c~char-mxser_new-debug-printk-dependent-on-debug drivers/char/mxser_new.c --- a/drivers/char/mxser_new.c~char-mxser_new-debug-printk-dependent-on-debug +++ a/drivers/char/mxser_new.c @@ -244,7 +244,6 @@ MODULE_DEVICE_TABLE(pci, mxser_pcibrds); static int ioaddr[MXSER_BOARDS] = { 0, 0, 0, 0 }; static int ttymajor = MXSERMAJOR; static int calloutmajor = MXSERCUMAJOR; -static int verbose = 0; /* Variables for insmod */ @@ -252,7 +251,6 @@ MODULE_AUTHOR("Casper Yang"); MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver"); module_param_array(ioaddr, int, NULL, 0); module_param(ttymajor, int, 0); -module_param(verbose, bool, 0); MODULE_LICENSE("GPL"); struct mxser_log { @@ -493,11 +491,9 @@ static int __init mxser_module_init(void { int ret; - if (verbose) - printk(KERN_DEBUG "Loading module mxser ...\n"); + pr_debug("Loading module mxser ...\n"); ret = mxser_init(); - if (verbose) - printk(KERN_DEBUG "Done.\n"); + pr_debug("Done.\n"); return ret; } @@ -505,8 +501,7 @@ static void __exit mxser_module_exit(voi { int i, err; - if (verbose) - printk(KERN_DEBUG "Unloading module mxser ...\n"); + pr_debug("Unloading module mxser ...\n"); err = tty_unregister_driver(mxvar_sdriver); if (!err) @@ -532,8 +527,7 @@ static void __exit mxser_module_exit(voi } } } - if (verbose) - printk(KERN_DEBUG "Done.\n"); + pr_debug("Done.\n"); } static void process_txrx_fifo(struct mxser_port *info) @@ -562,10 +556,7 @@ static int __devinit mxser_initbrd(struc unsigned int i; int retval; - /*if (verbose) */ { - printk(" max. baud rate = %d bps.\n", - brd->ports[0].max_baud); - } + printk(KERN_INFO "max. baud rate = %d bps.\n", brd->ports[0].max_baud); for (i = 0; i < brd->nports; i++) { info = &brd->ports[i]; _ Patches currently in -mm which might be from jirislaby@xxxxxxxxx are origin.patch git-watchdog.patch char-kill-unneeded-memsets.patch char-serial167-remove-useless-tty-check.patch pci-mxser-pci-refcounts.patch mxser-make-an-experimental-clone.patch char-mxser_new-correct-include-file.patch char-mxser_new-upgrade-to-191.patch char-mxser_new-rework-to-allow-dynamic-structs.patch char-mxser_new-use-__devinit-macros.patch char-mxser_new-pci_request_region-for-pci-regions.patch char-mxser_new-check-request_region-retvals.patch char-mxser_new-kill-unneeded-memsets.patch char-mxser_new-revert-spin_lock-changes.patch char-mxser_new-remove-request-for-testers-line.patch char-mxser_new-debug-printk-dependent-on-debug.patch char-mxser_new-alter-license-terms.patch char-mxser_new-code-upside-down.patch char-mxser_new-cmspar-is-defined.patch hisax-niccy-cleanup.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html