Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf176bc3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

ip2: cleanup globals 



- do not init .bss zeroed data to zero again (by memset or
  explicit assignment)
- use char [] instead of char * for string constants

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 47babd4c

drivers/char/ip2/ip2main.c

+7 −11
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ static int ip2_read_proc(char *, char **, off_t, int, int *, void * ); 
/*************/



/* String constants to identify ourselves */

static char *pcName    = "Computone IntelliPort Plus multiport driver";

static char *pcVersion = "1.2.14";

static const char pcName[] = "Computone IntelliPort Plus multiport driver";

static const char pcVersion[] = "1.2.14";



/* String constants for port names */

static char *pcDriver_name   = "ip2";

static char *pcIpl    		 = "ip2ipl";

static const char pcDriver_name[] = "ip2";

static const char pcIpl[] = "ip2ipl";



/***********************/

/* Function Prototypes */
@@ -237,8 +237,8 @@ static const struct file_operations ip2_ipl = { 
	.open		= ip2_ipl_open,

}; 



static unsigned long irq_counter = 0;

static unsigned long bh_counter = 0;

static unsigned long irq_counter;

static unsigned long bh_counter;



// Use immediate queue to service interrupts

#define USE_IQI
@@ -286,7 +286,7 @@ MODULE_AUTHOR("Doug McNash"); 
MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");

MODULE_LICENSE("GPL");



static int poll_only = 0;

static int poll_only;



static int Eisa_irq;

static int Eisa_slot;
@@ -615,10 +615,6 @@ static int ip2_loadmain(void) 
	/* Initialise the iiEllis subsystem. */

	iiEllisInit();



	/* Initialize arrays. */

	memset( i2BoardPtrTable, 0, sizeof i2BoardPtrTable );

	memset( DevTable, 0, sizeof DevTable );



	/* Initialise all the boards we can find (up to the maximum). */

	for ( i = 0; i < IP2_MAX_BOARDS; ++i ) {

		switch ( ip2config.addr[i] ) {