From 22cea2502fb382d6bae2617f7fa46e4621302d3a Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 17 Jul 2007 04:05:19 -0700 Subject: [PATCH] --- yaml --- r: 60875 b: refs/heads/master c: 3e98cee717fb8e9f4ff15a70e357927c5f3c7793 h: refs/heads/master i: 60873: 137b8402f3f702679cb61a10ac86634d0833d0cf 60871: 01e8b18e1ed77b51b0d01db77d700383790936d5 v: v3 --- [refs] | 2 +- trunk/drivers/char/specialix.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 36667f41a359..fc73310183ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c032f1dd393c995545ecefa8c1585ae9ef6b37 +refs/heads/master: 3e98cee717fb8e9f4ff15a70e357927c5f3c7793 diff --git a/trunk/drivers/char/specialix.c b/trunk/drivers/char/specialix.c index baf7234b6e66..455855631aef 100644 --- a/trunk/drivers/char/specialix.c +++ b/trunk/drivers/char/specialix.c @@ -345,18 +345,6 @@ static inline void sx_release_io_range(struct specialix_board * bp) } -/* Must be called with enabled interrupts */ -/* Ugly. Very ugly. Don't use this for anything else than initialization - code */ -static inline void sx_long_delay(unsigned long delay) -{ - unsigned long i; - - for (i = jiffies + delay; time_after(i, jiffies); ) ; -} - - - /* Set the IRQ using the RTS lines that run to the PAL on the board.... */ static int sx_set_irq ( struct specialix_board *bp) { @@ -397,7 +385,7 @@ static int sx_init_CD186x(struct specialix_board * bp) spin_lock_irqsave(&bp->lock, flags); sx_out_off(bp, CD186x_CCR, CCR_HARDRESET); /* Reset CD186x chip */ spin_unlock_irqrestore(&bp->lock, flags); - sx_long_delay(HZ/20); /* Delay 0.05 sec */ + msleep(50); /* Delay 0.05 sec */ spin_lock_irqsave(&bp->lock, flags); sx_out_off(bp, CD186x_GIVR, SX_ID); /* Set ID for this chip */ sx_out_off(bp, CD186x_GICR, 0); /* Clear all bits */ @@ -533,7 +521,7 @@ static int sx_probe(struct specialix_board *bp) sx_wait_CCR(bp); sx_out(bp, CD186x_CCR, CCR_TXEN); /* Enable transmitter */ sx_out(bp, CD186x_IER, IER_TXRDY); /* Enable tx empty intr */ - sx_long_delay(HZ/20); + msleep(50); irqs = probe_irq_off(irqs); dprintk (SX_DEBUG_INIT, "SRSR = %02x, ", sx_in(bp, CD186x_SRSR));