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

Commit d5f7e65d authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Remove redundant static variable initializers 



Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6225a16a

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static void NCR5380_set_timer(struct NCR5380_hostdata *hostdata, unsigned long t 
}





static int probe_irq __initdata = 0;

static int probe_irq __initdata;



/**

 *	probe_intr	-	helper for IRQ autoprobe

drivers/scsi/dtc.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static const struct signature { 


static int __init dtc_setup(char *str)

{

	static int commandline_current = 0;

	static int commandline_current;

	int i;

	int ints[10];
@@ -188,7 +188,7 @@ __setup("dtc=", dtc_setup); 


static int __init dtc_detect(struct scsi_host_template * tpnt)

{

	static int current_override = 0, current_base = 0;

	static int current_override, current_base;

	struct Scsi_Host *instance;

	unsigned int addr;

	void __iomem *base;

drivers/scsi/g_NCR5380.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct override { 


static void __init internal_setup(int board, char *str, int *ints)

{

	static int commandline_current = 0;

	static int commandline_current;

	switch (board) {

	case BOARD_NCR5380:

		if (ints[0] != 2 && ints[0] != 3) {
@@ -251,7 +251,7 @@ static int __init do_DTC3181E_setup(char *str) 


static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)

{

	static int current_override = 0;

	static int current_override;

	int count;

	unsigned int *ports;

#ifndef SCSI_G_NCR5380_MEM

drivers/scsi/pas16.c

+5 −5
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ 
#include "NCR5380.h"





static unsigned short pas16_addr = 0;

static int pas16_irq = 0;

static unsigned short pas16_addr;

static int pas16_irq;

 



static const int scsi_irq_translate[] =
@@ -305,7 +305,7 @@ static int __init 


static int __init pas16_setup(char *str)

{

    static int commandline_current = 0;

	static int commandline_current;

    int i;

    int ints[10];
@@ -344,8 +344,8 @@ __setup("pas16=", pas16_setup); 


static int __init pas16_detect(struct scsi_host_template *tpnt)

{

    static int current_override = 0;

    static unsigned short current_base = 0;

	static int current_override;

	static unsigned short current_base;

    struct Scsi_Host *instance;

    unsigned short io_port;

    int  count;

drivers/scsi/sun3_scsi.c

+4 −4
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ static struct scsi_cmnd *sun3_dma_setup_done; 
static unsigned char *sun3_scsi_regp;

static volatile struct sun3_dma_regs *dregs;

static struct sun3_udc_regs *udc_regs;

static unsigned char *sun3_dma_orig_addr = NULL;

static unsigned long sun3_dma_orig_count = 0;

static int sun3_dma_active = 0;

static unsigned long last_residual = 0;

static unsigned char *sun3_dma_orig_addr;

static unsigned long sun3_dma_orig_count;

static int sun3_dma_active;

static unsigned long last_residual;

static struct Scsi_Host *default_instance;



/*