Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43659
b: refs/heads/master
c: 7f58992
h: refs/heads/master
i:
  43657: 86718e1
  43655: f9a0b9b
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent ea227ef commit d528977
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e7eafa3245be66b3db5d430e2fb3414b1a32298a
refs/heads/master: 7f5899252b5052387ee983d67bbc55eafd33a516
19 changes: 5 additions & 14 deletions trunk/drivers/char/mxser_new.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,13 @@ 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 */

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 {
Expand Down Expand Up @@ -493,20 +491,17 @@ 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;
}

static void __exit mxser_module_exit(void)
{
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)
Expand All @@ -532,8 +527,7 @@ static void __exit mxser_module_exit(void)
}
}
}
if (verbose)
printk(KERN_DEBUG "Done.\n");
pr_debug("Done.\n");
}

static void process_txrx_fifo(struct mxser_port *info)
Expand Down Expand Up @@ -562,10 +556,7 @@ static int __devinit mxser_initbrd(struct mxser_board *brd)
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];
Expand Down

0 comments on commit d528977

Please sign in to comment.