Skip to content

Commit

Permalink
ip2: cleanup globals
Browse files Browse the repository at this point in the history
- 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: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Oct 13, 2008
1 parent 47babd4 commit cf176bc
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/char/ip2/ip2main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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] ) {
Expand Down

0 comments on commit cf176bc

Please sign in to comment.