Commit f4a1c2bc authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

lp_console: cleanups 



Remove NULL initializers and clean whitespace a bit.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47492527

drivers/char/lp.c

+8 −9
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static unsigned int lp_count = 0; 
static struct class *lp_class;



#ifdef CONFIG_LP_CONSOLE

static struct parport *console_registered; // initially NULL

static struct parport *console_registered;

#endif /* CONFIG_LP_CONSOLE */



#undef LP_DEBUG
@@ -749,8 +749,8 @@ static struct console lpcons = { 
/* --- initialisation code ------------------------------------- */



static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };

static char *parport[LP_NO] = { NULL,  };

static int reset = 0;

static char *parport[LP_NO];

static int reset;



module_param_array(parport, charp, NULL, 0);

module_param(reset, bool, 0);
@@ -758,7 +758,7 @@ module_param(reset, bool, 0); 
#ifndef MODULE

static int __init lp_setup (char *str)

{

	static int parport_ptr; // initially zero

	static int parport_ptr;

	int x;



	if (get_option(&str, &x)) {
@@ -823,8 +823,7 @@ static void lp_attach (struct parport *port) 
{

	unsigned int i;



	switch (parport_nr[0])

	{

	switch (parport_nr[0]) {

	case LP_PARPORT_UNSPEC:

	case LP_PARPORT_AUTO:

		if (parport_nr[0] == LP_PARPORT_AUTO &&