Commit 51a76834 authored by Linus Torvalds's avatar Linus Torvalds

Fix up various small compile warnings in an effort at

getting rid of the simple stuff that hides the serious things. 
parent dd99888a
...@@ -465,7 +465,8 @@ static irqreturn_t rio_interrupt (int irq, void *ptr, struct pt_regs *regs) ...@@ -465,7 +465,8 @@ static irqreturn_t rio_interrupt (int irq, void *ptr, struct pt_regs *regs)
rio_reset_interrupt (HostP); rio_reset_interrupt (HostP);
} }
if ((HostP->Flags & RUN_STATE) != RC_RUNNING) return; if ((HostP->Flags & RUN_STATE) != RC_RUNNING)
return IRQ_HANDLED;
if (test_and_set_bit (RIO_BOARD_INTR_LOCK, &HostP->locks)) { if (test_and_set_bit (RIO_BOARD_INTR_LOCK, &HostP->locks)) {
printk (KERN_ERR "Recursive interrupt! (host %d/irq%d)\n", printk (KERN_ERR "Recursive interrupt! (host %d/irq%d)\n",
......
...@@ -171,8 +171,6 @@ ...@@ -171,8 +171,6 @@
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif #endif
DECLARE_TASK_QUEUE(tq_specialix);
#undef RS_EVENT_WRITE_WAKEUP #undef RS_EVENT_WRITE_WAKEUP
#define RS_EVENT_WRITE_WAKEUP 0 #define RS_EVENT_WRITE_WAKEUP 0
...@@ -988,7 +986,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p ...@@ -988,7 +986,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
long tmp; long tmp;
unsigned char cor1 = 0, cor3 = 0; unsigned char cor1 = 0, cor3 = 0;
unsigned char mcor1 = 0, mcor2 = 0; unsigned char mcor1 = 0, mcor2 = 0;
static int again; static unsigned long again;
if (!(tty = port->tty) || !tty->termios) if (!(tty = port->tty) || !tty->termios)
return; return;
......
...@@ -6272,8 +6272,8 @@ static int idetape_cleanup (ide_drive_t *drive) ...@@ -6272,8 +6272,8 @@ static int idetape_cleanup (ide_drive_t *drive)
DRIVER(drive)->busy = 0; DRIVER(drive)->busy = 0;
(void) ide_unregister_subdriver(drive); (void) ide_unregister_subdriver(drive);
drive->driver_data = NULL; drive->driver_data = NULL;
devfs_remove("%s/mt"); devfs_remove("%s/mt", drive->devfs_name);
devfs_remove("%s/mtn"); devfs_remove("%s/mtn", drive->devfs_name);
devfs_unregister_tape(drive->disk->number); devfs_unregister_tape(drive->disk->number);
kfree (tape); kfree (tape);
drive->disk->fops = ide_fops; drive->disk->fops = ide_fops;
......
...@@ -118,7 +118,7 @@ static inline void calculate_expire(struct csr_control *csr) ...@@ -118,7 +118,7 @@ static inline void calculate_expire(struct csr_control *csr)
/* Just to keep from rounding low */ /* Just to keep from rounding low */
csr->expire++; csr->expire++;
HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%lu", csr->expire, HZ); HPSB_VERBOSE("CSR: setting expire to %lu, HZ=%u", csr->expire, HZ);
} }
......
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