diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /drivers/scsi/aha1542.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'drivers/scsi/aha1542.c')
| -rw-r--r-- | drivers/scsi/aha1542.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index c0003a18d..be4ba64c5 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -28,6 +28,7 @@ #include <linux/delay.h> #include <linux/sched.h> #include <linux/proc_fs.h> +#include <linux/init.h> #include <asm/dma.h> #include <asm/system.h> #include <asm/spinlock.h> @@ -155,7 +156,7 @@ static void do_aha1542_intr_handle(int irq, void *dev_id, struct pt_regs *regs); WAITbits = inb(port) & (mask); \ if ((WAITbits & (allof)) == (allof) && ((WAITbits & (noneof)) == 0)) \ break; \ - udelay(1000); \ + mdelay(1); \ if (--WAITtimeout == 0) goto fail; \ } \ } @@ -223,7 +224,7 @@ static int aha1542_in(unsigned int base, unchar *cmdp, int len) /* Similar to aha1542_in, except that we wait a very short period of time. We use this if we know the board is alive and awake, but we are not sure - if the board will respond the the command we are about to send or not */ + if the board will respond to the command we are about to send or not */ static int aha1542_in1(unsigned int base, unchar *cmdp, int len) { unsigned long flags; @@ -300,7 +301,6 @@ static int makecode(unsigned hosterr, unsigned scsierr) static int aha1542_test_port(int bse, struct Scsi_Host * shpnt) { - int i; unchar inquiry_cmd[] = {CMD_INQUIRY }; unchar inquiry_result[4]; unchar *cmdp; @@ -319,8 +319,7 @@ static int aha1542_test_port(int bse, struct Scsi_Host * shpnt) outb(SRST|IRST/*|SCRST*/, CONTROL(bse)); - i = jiffies + 2; - while (i>jiffies); /* Wait a little bit for things to settle down. */ + mdelay(20); /* Wait a little bit for things to settle down. */ debug = 1; /* Expect INIT and IDLE, any of the others are bad */ @@ -884,7 +883,7 @@ static int aha1542_query(int base_io, int * transl) } /* called from init/main.c */ -void aha1542_setup( char *str, int *ints) +__initfunc(void aha1542_setup( char *str, int *ints)) { const char *ahausage = "aha1542: usage: aha1542=<PORTBASE>[,<BUSON>,<BUSOFF>[,<DMASPEED>]]\n"; static int setup_idx = 0; |