dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

lp_console: cleanups 

Remove NULL initializers and clean whitespace a bit.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Machek 2007-10-16 23:30:29 -07:00 committed by Linus Torvalds
parent 4749252776
commit f4a1c2bce0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/char/lp.c
View File

@ -144,7 +144,7 @@ static unsigned int lp_count = 0;
static struct class *lp_class; static struct class *lp_class;
#ifdef CONFIG_LP_CONSOLE #ifdef CONFIG_LP_CONSOLE
static struct parport *console_registered; // initially NULL static struct parport *console_registered;
#endif /* CONFIG_LP_CONSOLE */ #endif /* CONFIG_LP_CONSOLE */
#undef LP_DEBUG #undef LP_DEBUG
@ -749,8 +749,8 @@ static struct console lpcons = {
/* --- initialisation code ------------------------------------- */ /* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC }; static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
static char *parport[LP_NO] = { NULL, }; static char *parport[LP_NO];
static int reset = 0; static int reset;
module_param_array(parport, charp, NULL, 0); module_param_array(parport, charp, NULL, 0);
module_param(reset, bool, 0); module_param(reset, bool, 0);
@ -758,10 +758,10 @@ module_param(reset, bool, 0);
#ifndef MODULE #ifndef MODULE
static int __init lp_setup (char *str) static int __init lp_setup (char *str)
{ {
static int parport_ptr; // initially zero static int parport_ptr;
int x; int x;
if (get_option (&str, &x)) { if (get_option(&str, &x)) {
if (x == 0) { if (x == 0) {
/* disable driver on "lp=" or "lp=0" */ /* disable driver on "lp=" or "lp=0" */
parport_nr[0] = LP_PARPORT_OFF; parport_nr[0] = LP_PARPORT_OFF;
@ -807,7 +807,7 @@ static int lp_register(int nr, struct parport *port)
#ifdef CONFIG_LP_CONSOLE #ifdef CONFIG_LP_CONSOLE
if (!nr) { if (!nr) {
if (port->modes & PARPORT_MODE_SAFEININT) { if (port->modes & PARPORT_MODE_SAFEININT) {
register_console (&lpcons); register_console(&lpcons);
console_registered = port; console_registered = port;
printk (KERN_INFO "lp%d: console ready\n", CONSOLE_LP); printk (KERN_INFO "lp%d: console ready\n", CONSOLE_LP);
} else } else
@ -823,8 +823,7 @@ static void lp_attach (struct parport *port)
{ {
unsigned int i; unsigned int i;
switch (parport_nr[0]) switch (parport_nr[0]) {
{
case LP_PARPORT_UNSPEC: case LP_PARPORT_UNSPEC:
case LP_PARPORT_AUTO: case LP_PARPORT_AUTO:
if (parport_nr[0] == LP_PARPORT_AUTO && if (parport_nr[0] == LP_PARPORT_AUTO &&
@ -855,7 +854,7 @@ static void lp_detach (struct parport *port)
/* Write this some day. */ /* Write this some day. */
#ifdef CONFIG_LP_CONSOLE #ifdef CONFIG_LP_CONSOLE
if (console_registered == port) { if (console_registered == port) {
unregister_console (&lpcons); unregister_console(&lpcons);
console_registered = NULL; console_registered = NULL;
} }
#endif /* CONFIG_LP_CONSOLE */ #endif /* CONFIG_LP_CONSOLE */