Commit 96df3490 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley

[PATCH] some warning fixes

parent 9b4a996f
...@@ -4303,7 +4303,6 @@ advansys_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -4303,7 +4303,6 @@ advansys_proc_info(char *buffer, char **start, off_t offset, int length,
int leftlen; int leftlen;
char *curbuf; char *curbuf;
off_t advoffset; off_t advoffset;
Scsi_Device *scd;
#ifdef ADVANSYS_STATS #ifdef ADVANSYS_STATS
int tgt_id; int tgt_id;
#endif /* ADVANSYS_STATS */ #endif /* ADVANSYS_STATS */
......
...@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt, ...@@ -67,7 +67,7 @@ static void BAD_SG_DMA(Scsi_Cmnd * SCpnt,
int nseg, int nseg,
int badseg) int badseg)
{ {
printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %d\n", printk(KERN_CRIT "sgpnt[%d:%d] page %p/0x%x length %ld\n",
badseg, nseg, badseg, nseg,
page_address(sgpnt[badseg].page) + sgpnt[badseg].offset, page_address(sgpnt[badseg].page) + sgpnt[badseg].offset,
SCSI_SG_PA(&sgpnt[badseg]), SCSI_SG_PA(&sgpnt[badseg]),
......
...@@ -106,7 +106,6 @@ static int eata_pio_proc_info(char *buffer, char **start, off_t offset, ...@@ -106,7 +106,6 @@ static int eata_pio_proc_info(char *buffer, char **start, off_t offset,
int length, int hostno, int rw) int length, int hostno, int rw)
{ {
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct scsi_device *sdev;
static u8 buff[512]; static u8 buff[512];
int size, len = 0; int size, len = 0;
off_t begin = 0, pos = 0; off_t begin = 0, pos = 0;
......
...@@ -740,7 +740,7 @@ static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs) ...@@ -740,7 +740,7 @@ static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs)
#if DEBUG_RACE #if DEBUG_RACE
in_interrupt_flag = 0; in_interrupt_flag = 0;
#endif #endif
return; return IRQ_HANDLED;
} else if (current_SC->SCp.phase & in_selection) { } else if (current_SC->SCp.phase & in_selection) {
status = inb(SCSI_Status_port); status = inb(SCSI_Status_port);
if (!(status & 0x01)) { if (!(status & 0x01)) {
......
...@@ -2420,7 +2420,6 @@ static void nsp32_adjust_busfree(nsp32_hw_data *data, unsigned int s_sacklen) ...@@ -2420,7 +2420,6 @@ static void nsp32_adjust_busfree(nsp32_hw_data *data, unsigned int s_sacklen)
static void nsp32_msgout_occur(nsp32_hw_data *data) static void nsp32_msgout_occur(nsp32_hw_data *data)
{ {
unsigned int base = data->BaseAddress; unsigned int base = data->BaseAddress;
unsigned short command;
long new_sgtp; long new_sgtp;
int i; int i;
......
...@@ -1897,7 +1897,8 @@ static irqreturn_t do_interrupt_handler(int irq, void *shap, ...@@ -1897,7 +1897,8 @@ static irqreturn_t do_interrupt_handler(int irq, void *shap,
unsigned long spin_flags; unsigned long spin_flags;
/* Check if the interrupt must be processed by this handler */ /* Check if the interrupt must be processed by this handler */
if ((j = (unsigned int)((char *)shap - sha)) >= num_boards) return; if ((j = (unsigned int)((char *)shap - sha)) >= num_boards)
return IRQ_NONE;
spin_lock_irqsave(sh[j]->host_lock, spin_flags); spin_lock_irqsave(sh[j]->host_lock, spin_flags);
ihdlr(irq, j); ihdlr(irq, j);
......
...@@ -252,7 +252,7 @@ static struct ultrastor_config ...@@ -252,7 +252,7 @@ static struct ultrastor_config
#if ULTRASTOR_MAX_CMDS == 1 #if ULTRASTOR_MAX_CMDS == 1
unsigned char mscp_busy; unsigned char mscp_busy;
#else #else
unsigned short mscp_free; unsigned long mscp_free;
#endif #endif
volatile unsigned char aborted[ULTRASTOR_MAX_CMDS]; volatile unsigned char aborted[ULTRASTOR_MAX_CMDS];
struct mscp mscp[ULTRASTOR_MAX_CMDS]; struct mscp mscp[ULTRASTOR_MAX_CMDS];
......
...@@ -1375,7 +1375,6 @@ static int wd7000_set_info(char *buffer, int length, struct Scsi_Host *host) ...@@ -1375,7 +1375,6 @@ static int wd7000_set_info(char *buffer, int length, struct Scsi_Host *host)
static int wd7000_proc_info(char *buffer, char **start, off_t offset, int length, int hostno, int inout) static int wd7000_proc_info(char *buffer, char **start, off_t offset, int length, int hostno, int inout)
{ {
struct Scsi_Host *host = NULL; struct Scsi_Host *host = NULL;
Scsi_Device *scd;
Adapter *adapter; Adapter *adapter;
unsigned long flags; unsigned long flags;
char *pos = buffer; char *pos = buffer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment