diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-14 13:18:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-14 13:19:04 +0200 |
| commit | 6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e (patch) | |
| tree | 021cc9f6b477146fcebe6f3be4752abfa2ba18a9 /drivers/isdn/pcbit/module.c | |
| parent | 682968e0c425c60f0dde37977e5beb2b12ddc4cc (diff) | |
| parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) | |
Merge branch 'perf/core' into perf/uprobes
Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/isdn/pcbit/module.c')
| -rw-r--r-- | drivers/isdn/pcbit/module.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/isdn/pcbit/module.c b/drivers/isdn/pcbit/module.c index 04ea241ff17..0a59bd0b821 100644 --- a/drivers/isdn/pcbit/module.c +++ b/drivers/isdn/pcbit/module.c @@ -2,10 +2,10 @@ * PCBIT-D module support * * Copyright (C) 1996 Universidade de Lisboa - * + * * Written by Pedro Roque Marques (roque@di.fc.ul.pt) * - * This software may be used and distributed according to the terms of + * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. */ @@ -29,7 +29,7 @@ module_param_array(mem, int, NULL, 0); module_param_array(irq, int, NULL, 0); static int num_boards; -struct pcbit_dev * dev_pcbit[MAX_PCBIT_CARDS]; +struct pcbit_dev *dev_pcbit[MAX_PCBIT_CARDS]; static int __init pcbit_init(void) { @@ -37,26 +37,26 @@ static int __init pcbit_init(void) num_boards = 0; - printk(KERN_NOTICE + printk(KERN_NOTICE "PCBIT-D device driver v 0.5-fjpc0 19991204 - " "Copyright (C) 1996 Universidade de Lisboa\n"); - if (mem[0] || irq[0]) + if (mem[0] || irq[0]) { - for (board=0; board < MAX_PCBIT_CARDS && mem[board] && irq[board]; board++) + for (board = 0; board < MAX_PCBIT_CARDS && mem[board] && irq[board]; board++) { if (!mem[board]) mem[board] = 0xD0000; if (!irq[board]) irq[board] = 5; - + if (pcbit_init_dev(board, mem[board], irq[board]) == 0) num_boards++; - - else + + else { - printk(KERN_WARNING - "pcbit_init failed for dev %d", + printk(KERN_WARNING + "pcbit_init failed for dev %d", board + 1); return -EIO; } @@ -67,7 +67,7 @@ static int __init pcbit_init(void) if (!num_boards) { - printk(KERN_INFO + printk(KERN_INFO "Trying to detect board using default settings\n"); if (pcbit_init_dev(0, 0xD0000, 5) == 0) num_boards++; @@ -84,7 +84,7 @@ static void __exit pcbit_exit(void) for (board = 0; board < num_boards; board++) pcbit_terminate(board); - printk(KERN_NOTICE + printk(KERN_NOTICE "PCBIT-D module unloaded\n"); #endif } @@ -95,20 +95,20 @@ static int __init pcbit_setup(char *line) { int i, j, argc; char *str; - int ints[MAX_PARA+1]; + int ints[MAX_PARA + 1]; str = get_options(line, MAX_PARA, ints); argc = ints[0]; i = 0; j = 1; - while (argc && (i<MAX_PCBIT_CARDS)) { + while (argc && (i < MAX_PCBIT_CARDS)) { if (argc) { mem[i] = ints[j]; j++; argc--; } - + if (argc) { irq[i] = ints[j]; j++; argc--; @@ -116,11 +116,10 @@ static int __init pcbit_setup(char *line) i++; } - return(1); + return (1); } __setup("pcbit=", pcbit_setup); #endif module_init(pcbit_init); module_exit(pcbit_exit); - |